Post-rebase fixes

src/win/win32_window.rs

@@ -1,15 +1,15 @@
 use crate::win::util::to_wstr;
 use crate::{PhySize, Size, WindowInfo, WindowOpenOptions, WindowScalePolicy};
-use raw_window_handle::{RawWindowHandle, Win32WindowHandle};
+use raw_window_handle::Win32WindowHandle;
 use std::cell::Cell;
 use std::ffi::c_void;
 use std::ptr::null_mut;
 use winapi::shared::minwindef::{DWORD, UINT};
 use winapi::shared::windef::{HWND, RECT};
 use winapi::um::winuser::{
-    AdjustWindowRectEx, CreateWindowExW, GetDpiForWindow, KillTimer, PostMessageW,
-    SetProcessDpiAwarenessContext, SetTimer, SetWindowPos, SWP_NOMOVE, SWP_NOZORDER, WM_USER,
-    WS_CAPTION, WS_CHILD, WS_CLIPSIBLINGS, WS_MAXIMIZEBOX, WS_MINIMIZEBOX, WS_POPUPWINDOW,
+    AdjustWindowRectEx, CreateWindowExW, GetDpiForWindow, GetFocus, KillTimer, PostMessageW,
+    SetFocus, SetProcessDpiAwarenessContext, SetTimer, SetWindowPos, SWP_NOMOVE, SWP_NOZORDER,
+    WM_USER, WS_CAPTION, WS_CHILD, WS_CLIPSIBLINGS, WS_MAXIMIZEBOX, WS_MINIMIZEBOX, WS_POPUPWINDOW,
     WS_SIZEBOX, WS_VISIBLE,
 };
 
@@ -170,6 +170,17 @@ impl Win32Window {
         self.current_size.set(new_size);
     }
 
+    pub fn has_focus(&self) -> bool {
+        let focused_window = unsafe { GetFocus() };
+        focused_window == self.handle
+    }
+
+    pub fn focus(&self) {
+        unsafe {
+            SetFocus(self.handle);
+        }
+    }
+
     pub fn handle(&self) -> HWND {
         self.handle
     }

src/win/window.rs

@@ -98,6 +98,14 @@ impl Window {
         self.defer_task(WindowTask::Resize(size))
     }
 
+    pub fn has_focus(&self) -> bool {
+        self.win32_window.has_focus()
+    }
+
+    pub fn focus(&self) {
+        self.win32_window.focus()
+    }
+
     pub fn set_mouse_cursor(&self, _mouse_cursor: MouseCursor) {
         todo!()
     }

src/window.rs

@@ -103,12 +103,12 @@ impl Window {
         self.inner().set_mouse_cursor(cursor);
     }
 
-    pub fn has_focus(&mut self) -> bool {
-        self.window.has_focus()
+    pub fn has_focus(&self) -> bool {
+        self.inner().has_focus()
     }
 
-    pub fn focus(&mut self) {
-        self.window.focus()
+    pub fn focus(&self) {
+        self.inner().focus()
     }
 
     /// If provided, then an OpenGL context will be created for this window. You'll be able to