From acda14c7f1548830b0422f6cdb38af1ce05f65f2 Mon Sep 17 00:00:00 2001
From: Robin Quint <rob2309@hotmail.de>
Date: Wed, 2 Mar 2022 10:42:39 +0100
Subject: [PATCH] Fixed initial window position

---
 imgui-examples/examples/support/mod.rs |  2 +-
 imgui-winit-support/src/lib.rs         | 16 +++++++++++++---
 imgui/src/context.rs                   |  2 +-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/imgui-examples/examples/support/mod.rs b/imgui-examples/examples/support/mod.rs
index aacd200..1424dcd 100644
--- a/imgui-examples/examples/support/mod.rs
+++ b/imgui-examples/examples/support/mod.rs
@@ -43,7 +43,7 @@ pub fn init(title: &str) -> System {
     }
 
     let mut platform = WinitPlatform::init(&mut imgui);
-    WinitPlatform::init_viewports(&mut imgui, &event_loop);
+    WinitPlatform::init_viewports(&mut imgui, display.gl_window().window(), &event_loop);
     {
         let gl_window = display.gl_window();
         let window = gl_window.window();
diff --git a/imgui-winit-support/src/lib.rs b/imgui-winit-support/src/lib.rs
index 735d8d2..02dc30a 100644
--- a/imgui-winit-support/src/lib.rs
+++ b/imgui-winit-support/src/lib.rs
@@ -600,7 +600,7 @@ impl WinitPlatform {
     }
 
     #[cfg(feature = "viewports")]
-    pub fn init_viewports<T>(imgui: &mut Context, event_loop: &winit::event_loop::EventLoop<T>) {
+    pub fn init_viewports<T>(imgui: &mut Context, main_window: &winit::window::Window, event_loop: &winit::event_loop::EventLoop<T>) {
         let io = imgui.io_mut();
 
         io.backend_flags.insert(BackendFlags::PLATFORM_HAS_VIEWPORTS);
@@ -619,6 +619,11 @@ impl WinitPlatform {
         }
         imgui.platform_io_mut().monitors.replace_from_slice(&monitors);
 
+        let pos = main_window.inner_position().unwrap();
+        let pos = [pos.x as f32, pos.y as f32];
+        let size = main_window.inner_size();
+        let size = [size.width as f32, size.height as f32];
+
         let main_viewport = imgui.main_viewport_mut();
         main_viewport.platform_user_data = Box::into_raw(Box::new(ViewportState {
             create: false,
@@ -628,8 +633,8 @@ impl WinitPlatform {
             set_size: None,
             set_focus: false,
             set_title: None,
-            pos: [0.0, 0.0],
-            size: [0.0, 0.0],
+            pos,
+            size,
             focus: true,
             minimized: false,
         })) as *mut _;
@@ -1082,6 +1087,11 @@ impl WinitPlatform {
                 match *event {
                     WindowEvent::Resized(new_size) => {
                         state.size = [new_size.width as f32, new_size.height as f32];
+                        if new_size.width == 0 || new_size.height == 0 {
+                            state.minimized = true;
+                        } else {
+                            state.minimized = false;
+                        }
                     },
                     WindowEvent::Moved(_new_pos) => {
                         let pos = window.inner_position().unwrap();
diff --git a/imgui/src/context.rs b/imgui/src/context.rs
index 00d780a..1f843c8 100644
--- a/imgui/src/context.rs
+++ b/imgui/src/context.rs
@@ -1,6 +1,6 @@
 use parking_lot::ReentrantMutex;
 use std::cell::UnsafeCell;
-use std::ffi::{CStr, CString, c_void};
+use std::ffi::{CStr, CString};
 use std::ops::Drop;
 use std::path::PathBuf;
 use std::ptr::{self, null_mut};