Merge pull request #1863 from proneon267/patch-1

Added support for `set_full_screen` in WinForms.
beeware · Apr 12, 2023 · 652abad · 652abad
2 parents b5f6c6d + 0b9642c
commit 652abad
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/changes/1863.feature.rst b/changes/1863.feature.rst
@@ -0,0 +1 @@
+Winforms apps can now go full screen.
diff --git a/cocoa/src/toga_cocoa/app.py b/cocoa/src/toga_cocoa/app.py
@@ -388,6 +388,7 @@ def enter_full_screen(self, windows):
             # about its Toga representations.
             window.content._impl.native.window._impl = window._impl
             window.content._impl.native.window.interface = window
+            window.content.refresh()
 
     def exit_full_screen(self, windows):
         opts = NSMutableDictionary.alloc().init()
@@ -397,6 +398,7 @@ def exit_full_screen(self, windows):
 
         for window in windows:
             window.content._impl.native.exitFullScreenModeWithOptions(opts)
+            window.content.refresh()
 
     def show_cursor(self):
         if not self._cursor_visible:

diff --git a/examples/window/window/app.py b/examples/window/window/app.py
@@ -22,6 +22,12 @@ def do_small(self, widget, **kwargs):
     def do_large(self, widget, **kwargs):
         self.main_window.size = (1500, 1000)
 
+    def do_full_screen(self, widget, **kwargs):
+        if self.is_full_screen:
+            self.exit_full_screen()
+        else:
+            self.set_full_screen(self.main_window)
+
     def do_title(self, widget, **kwargs):
         self.main_window.title = f"Time is {datetime.now()}"
 
@@ -121,6 +127,9 @@ def startup(self):
         btn_do_large = toga.Button(
             "Become large", on_press=self.do_large, style=btn_style
         )
+        btn_do_full_screen = toga.Button(
+            "Become full screen", on_press=self.do_full_screen, style=btn_style
+        )
         btn_do_title = toga.Button(
             "Change title", on_press=self.do_title, style=btn_style
         )
@@ -140,6 +149,7 @@ def startup(self):
                 btn_do_right,
                 btn_do_small,
                 btn_do_large,
+                btn_do_full_screen,
                 btn_do_title,
                 btn_do_new_windows,
                 btn_do_report,

diff --git a/winforms/src/toga_winforms/app.py b/winforms/src/toga_winforms/app.py
@@ -293,10 +293,12 @@ def current_window(self):
         self.interface.factory.not_implemented("App.current_window()")
 
     def enter_full_screen(self, windows):
-        self.interface.factory.not_implemented("App.enter_full_screen()")
+        for window in windows:
+            window._impl.set_full_screen(True)
 
     def exit_full_screen(self, windows):
-        self.interface.factory.not_implemented("App.exit_full_screen()")
+        for window in windows:
+            window._impl.set_full_screen(False)
 
     def set_cursor(self, value):
         self.interface.factory.not_implemented("App.set_cursor()")

diff --git a/winforms/src/toga_winforms/window.py b/winforms/src/toga_winforms/window.py
@@ -198,7 +198,12 @@ def winforms_FormClosing(self, sender, event):
                 event.Cancel = True
 
     def set_full_screen(self, is_full_screen):
-        self.interface.factory.not_implemented("Window.set_full_screen()")
+        if is_full_screen:
+            self.native.FormBorderStyle = WinForms.FormBorderStyle(0)
+            self.native.WindowState = WinForms.FormWindowState.Maximized
+        else:
+            self.native.FormBorderStyle = WinForms.FormBorderStyle(1)
+            self.native.WindowState = WinForms.FormWindowState.Normal
 
     def close(self):
         self._is_closing = True