From 44db8d81e67286090fd47da01bb770403b0ee5fe Mon Sep 17 00:00:00 2001 From: Joonas Javanainen Date: Tue, 4 Dec 2018 20:13:49 +0200 Subject: [PATCH] Upgrade to imgui 1.66b --- CHANGELOG.markdown | 2 +- README.markdown | 2 +- imgui-sys/src/lib.rs | 1 + imgui-sys/src/structs.rs | 2 ++ imgui-sys/third-party/cimgui | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown index f0acb3b..b5127a0 100644 --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -8,7 +8,7 @@ ### Changed -- Upgrade to cimgui 1.66.2 / imgui 1.66. **This is a very big update, so there +- Upgrade to cimgui 1.66.2+ / imgui 1.66b. **This is a very big update, so there are a lot of breaking changes** ## [0.0.21] - 2018-10-11 diff --git a/README.markdown b/README.markdown index 085753d..11d4f5e 100644 --- a/README.markdown +++ b/README.markdown @@ -4,7 +4,7 @@ Minimum Rust version: 1.26 -Wrapped Dear ImGui version: 1.66 +Wrapped Dear ImGui version: 1.66b [![Build Status](https://travis-ci.org/Gekkio/imgui-rs.svg?branch=master)](https://travis-ci.org/Gekkio/imgui-rs) [![Latest release on crates.io](https://meritbadge.herokuapp.com/imgui)](https://crates.io/crates/imgui) diff --git a/imgui-sys/src/lib.rs b/imgui-sys/src/lib.rs index ac5c397..a7e6dbb 100644 --- a/imgui-sys/src/lib.rs +++ b/imgui-sys/src/lib.rs @@ -187,6 +187,7 @@ extern "C" { // Demo, Debug, Information extern "C" { + pub fn igShowAboutWindow(opened: *mut bool); pub fn igShowDemoWindow(opened: *mut bool); pub fn igShowMetricsWindow(opened: *mut bool); pub fn igShowStyleEditor(style: *mut ImGuiStyle); diff --git a/imgui-sys/src/structs.rs b/imgui-sys/src/structs.rs index fb299f5..1815704 100644 --- a/imgui-sys/src/structs.rs +++ b/imgui-sys/src/structs.rs @@ -237,6 +237,8 @@ pub struct ImGuiIO { pub config_mac_osx_behaviors: bool, pub config_input_text_cursor_blink: bool, pub config_resize_windows_from_edges: bool, + pub backend_platform_name: *const c_char, + pub backend_renderer_name: *const c_char, pub get_clipboard_text_fn: Option *const c_char>, pub set_clipboard_text_fn: Option, diff --git a/imgui-sys/third-party/cimgui b/imgui-sys/third-party/cimgui index 204f282..67f3b09 160000 --- a/imgui-sys/third-party/cimgui +++ b/imgui-sys/third-party/cimgui @@ -1 +1 @@ -Subproject commit 204f2828bb81857ffa4b9e2dbc360eabbb7cbd25 +Subproject commit 67f3b097a5090dd074be959fb9c794bd75096a1c