elias/imgui-rs
1
0
Fork 0
mirror of https://github.com/eliasstepanik/imgui-rs.git synced 2026-01-27 21:38:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compile errors with 1.80 update

Browse Source
This commit is contained in:
Thom Chiovoloni 2021-02-01 03:17:36 -08:00
parent 7f5b74e8a4
commit 53828505ed
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
imgui/src/draw_list.rs
View File

@ -592,7 +592,7 @@ impl<'ui> BezierCurve<'ui> {
/// Draw the curve on the window. /// Draw the curve on the window.
pub fn build(self) { pub fn build(self) {
unsafe { unsafe {
sys::ImDrawList_AddBezierCurve( sys::ImDrawList_AddBezierCubic(
self.draw_list.draw_list, self.draw_list.draw_list,
self.pos0.into(), self.pos0.into(),
self.cp0.into(), self.cp0.into(),

5
imgui/src/io.rs
View File

@ -213,8 +213,7 @@ pub struct Io {
pub(crate) clipboard_user_data: *mut c_void, pub(crate) clipboard_user_data: *mut c_void,
ime_set_input_screen_pos_fn: Option<unsafe extern "C" fn(x: c_int, y: c_int)>, ime_set_input_screen_pos_fn: Option<unsafe extern "C" fn(x: c_int, y: c_int)>,
ime_window_handle: *mut c_void, ime_window_handle: *mut c_void,
render_draw_lists_fn_unused: *mut c_void, // render_draw_lists_fn_unused: *mut c_void,
/// Mouse position, in pixels. /// Mouse position, in pixels.
/// ///
/// Set to [f32::MAX, f32::MAX] if mouse is unavailable (on another screen, etc.). /// Set to [f32::MAX, f32::MAX] if mouse is unavailable (on another screen, etc.).
@ -438,7 +437,7 @@ fn test_io_memory_layout() {
assert_field_offset!(clipboard_user_data, ClipboardUserData); assert_field_offset!(clipboard_user_data, ClipboardUserData);
assert_field_offset!(ime_set_input_screen_pos_fn, ImeSetInputScreenPosFn); assert_field_offset!(ime_set_input_screen_pos_fn, ImeSetInputScreenPosFn);
assert_field_offset!(ime_window_handle, ImeWindowHandle); assert_field_offset!(ime_window_handle, ImeWindowHandle);
assert_field_offset!(render_draw_lists_fn_unused, RenderDrawListsFnUnused); // assert_field_offset!(render_draw_lists_fn_unused, RenderDrawListsFnUnused);
assert_field_offset!(mouse_pos, MousePos); assert_field_offset!(mouse_pos, MousePos);
assert_field_offset!(mouse_down, MouseDown); assert_field_offset!(mouse_down, MouseDown);
assert_field_offset!(mouse_wheel, MouseWheel); assert_field_offset!(mouse_wheel, MouseWheel);

17
imgui/src/style.rs
View File

@ -199,6 +199,13 @@ impl IndexMut<StyleColor> for Style {
#[repr(u32)] #[repr(u32)]
#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)] #[derive(Copy, Clone, Debug, Hash, Eq, PartialEq)]
pub enum StyleColor { pub enum StyleColor {
// pub const ImGuiCol_TextSelectedBg: ImGuiCol_ = 47;
// pub const ImGuiCol_DragDropTarget: ImGuiCol_ = 48;
// pub const ImGuiCol_NavHighlight: ImGuiCol_ = 49;
// pub const ImGuiCol_NavWindowingHighlight: ImGuiCol_ = 50;
// pub const ImGuiCol_NavWindowingDimBg: ImGuiCol_ = 51;
// pub const ImGuiCol_ModalWindowDimBg: ImGuiCol_ = 52;
// pub const ImGuiCol_COUNT: ImGuiCol_ = 53;
Text = sys::ImGuiCol_Text, Text = sys::ImGuiCol_Text,
TextDisabled = sys::ImGuiCol_TextDisabled, TextDisabled = sys::ImGuiCol_TextDisabled,
/// Background of normal windows /// Background of normal windows
@ -245,6 +252,11 @@ pub enum StyleColor {
PlotLinesHovered = sys::ImGuiCol_PlotLinesHovered, PlotLinesHovered = sys::ImGuiCol_PlotLinesHovered,
PlotHistogram = sys::ImGuiCol_PlotHistogram, PlotHistogram = sys::ImGuiCol_PlotHistogram,
PlotHistogramHovered = sys::ImGuiCol_PlotHistogramHovered, PlotHistogramHovered = sys::ImGuiCol_PlotHistogramHovered,
TableHeaderBg = sys::ImGuiCol_TableHeaderBg,
TableBorderStrong = sys::ImGuiCol_TableBorderStrong,
TableBorderLight = sys::ImGuiCol_TableBorderLight,
TableRowBg = sys::ImGuiCol_TableRowBg,
TableRowBgAlt = sys::ImGuiCol_TableRowBgAlt,
TextSelectedBg = sys::ImGuiCol_TextSelectedBg, TextSelectedBg = sys::ImGuiCol_TextSelectedBg,
DragDropTarget = sys::ImGuiCol_DragDropTarget, DragDropTarget = sys::ImGuiCol_DragDropTarget,
/// Gamepad/keyboard: current highlighted item /// Gamepad/keyboard: current highlighted item
@ -302,6 +314,11 @@ impl StyleColor {
StyleColor::PlotLinesHovered, StyleColor::PlotLinesHovered,
StyleColor::PlotHistogram, StyleColor::PlotHistogram,
StyleColor::PlotHistogramHovered, StyleColor::PlotHistogramHovered,
StyleColor::TableHeaderBg,
StyleColor::TableBorderStrong,
StyleColor::TableBorderLight,
StyleColor::TableRowBg,
StyleColor::TableRowBgAlt,
StyleColor::TextSelectedBg, StyleColor::TextSelectedBg,
StyleColor::DragDropTarget, StyleColor::DragDropTarget,
StyleColor::NavHighlight, StyleColor::NavHighlight,