Fixed the bug for #1895.

beeware · Apr 25, 2023 · fdb300a · fdb300a
1 parent 76713a9
commit fdb300a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/changes/1895.bugfix.rst b/changes/1895.bugfix.rst
@@ -0,0 +1 @@
+Ensured that the windows backend for `current_window` works properly.
diff --git a/winforms/src/toga_winforms/app.py b/winforms/src/toga_winforms/app.py
@@ -292,7 +292,9 @@ def set_main_window(self, window):
         self.app_context.MainForm = window._impl.native
 
     def get_current_window(self):
-        return WinForms.Form.ActiveForm._impl
+        for window in self.interface.windows:
+            if WinForms.Form.ActiveForm == window._impl.native:
+                return window._impl.native
 
     def set_current_window(self, window):
         window._impl.native.Activate()

diff --git a/winforms/src/toga_winforms/window.py b/winforms/src/toga_winforms/window.py
@@ -47,6 +47,9 @@ def __init__(self, interface, title, position, size):
 
         self.native = WinForms.Form()
         self.native.interface = self.interface
+
+        self.native._impl = self
+
         self.native.FormClosing += self.winforms_FormClosing
 
         self.native.MinimizeBox = self.native.interface.minimizable