refactor(ui): use self.center_window_on_screen() instead of BaseWindow.center_window_on_screen()

Address GitHub Copilot PR #1387 review findings:

- Replace BaseWindow.center_window_on_screen(self.root) with
  self.center_window_on_screen(self.root) in all 8 subclass windows to
  respect polymorphism and allow instance-level mock patching
- Strengthen withdrawn-parent centering test: reset mocks after __init__,
  assert exactly one call via update_progress_bar(), and verify
  window.progress_window is the argument passed
- Add test_uses_rendered_size_when_window_is_mapped to assert that
  winfo_width/height (rendered size) is preferred over winfo_reqwidth/
  winfo_reqheight (content size) when the window is already mapped

Author: amilcarlucas

ardupilot_methodic_configurator/frontend_tkinter_component_editor_base.py

@@ -153,7 +153,7 @@ def _setup_window(self) -> None:
             _("Amilcar Lucas's - ArduPilot methodic configurator ") + self.version + _(" - Vehicle Component Editor")
         )
         self.root.geometry(self.calculate_scaled_geometry(WINDOW_WIDTH_PIX, 600))
-        BaseWindow.center_window_on_screen(self.root)
+        self.center_window_on_screen(self.root)
         self.root.protocol("WM_DELETE_WINDOW", self.on_closing)
 
     def _setup_styles(self) -> None:

ardupilot_methodic_configurator/frontend_tkinter_connection_selection.py

@@ -317,7 +317,7 @@ def __init__(
         super().__init__()
         self.root.title(_("AMC {version} - Flight controller connection").format(version=__version__))  # Set the window title
         self.root.geometry(self.calculate_scaled_geometry(520, 462))  # Set the window size
-        BaseWindow.center_window_on_screen(self.root)
+        self.center_window_on_screen(self.root)
         self.default_baudrate = default_baudrate
 
         # Explain why we are here

ardupilot_methodic_configurator/frontend_tkinter_flightcontroller_info.py

@@ -76,7 +76,7 @@ def __init__(self, flight_controller: FlightController, vehicle_dir: Path) -> No
         super().__init__()
         self.root.title(_("AMC {version} - Flight Controller Info").format(version=__version__))  # Set the window title
         self.root.geometry(self.calculate_scaled_geometry(500, 420))  # Adjust the window size as needed
-        BaseWindow.center_window_on_screen(self.root)
+        self.center_window_on_screen(self.root)
 
         self.presenter = FlightControllerInfoPresenter(flight_controller, vehicle_dir)
 

ardupilot_methodic_configurator/frontend_tkinter_parameter_editor.py

@@ -254,7 +254,7 @@ def __init__(
             _("Amilcar Lucas's - ArduPilot methodic configurator ") + __version__ + _(" - Parameter file editor and uploader")
         )
         self.root.geometry(self.calculate_scaled_geometry(990, 630))  # Set the window width and height
-        BaseWindow.center_window_on_screen(self.root)
+        self.center_window_on_screen(self.root)
 
         # Bind the close_connection_and_quit function to the window close event
         self.root.protocol("WM_DELETE_WINDOW", self.close_connection_and_quit)

ardupilot_methodic_configurator/frontend_tkinter_project_creator.py

@@ -138,7 +138,7 @@ def template_selection_callback(_widget: "DirectorySelectionWidgets") -> str:
         self.root.geometry(
             f"{round(800 * self.dpi_scaling_factor)}x{round(window_height * self.dpi_scaling_factor)}"
         )  # Set the window size
-        BaseWindow.center_window_on_screen(self.root)
+        self.center_window_on_screen(self.root)
 
         for setting_name, metadata in settings_metadata.items():
             checkbox = ttk.Checkbutton(

ardupilot_methodic_configurator/frontend_tkinter_project_opener.py

@@ -56,7 +56,7 @@ def __init__(self, project_manager: VehicleProjectManager) -> None:
         )
 
         self.root.geometry(self.calculate_scaled_geometry(600, 450))  # Set the window size
-        BaseWindow.center_window_on_screen(self.root)
+        self.center_window_on_screen(self.root)
 
         # Explain why we are here
         introduction_text = self.project_manager.get_introduction_message()

ardupilot_methodic_configurator/frontend_tkinter_software_update.py

@@ -28,7 +28,7 @@ def __init__(self, version_info: str, download_callback: Optional[Callable[[], b
             )
         )
         self.root.geometry(self.calculate_scaled_geometry(700, 600))
-        BaseWindow.center_window_on_screen(self.root)
+        self.center_window_on_screen(self.root)
         self.download_callback = download_callback
         self.root.protocol("WM_DELETE_WINDOW", self.on_cancel)
 

ardupilot_methodic_configurator/frontend_tkinter_template_overview.py

@@ -114,7 +114,7 @@ def _configure_window(self) -> None:
 
         # Scale window geometry for HiDPI displays
         self.root.geometry(self.calculate_scaled_geometry(1200, 600))
-        BaseWindow.center_window_on_screen(self.root)
+        self.center_window_on_screen(self.root)
 
     def _initialize_ui_components(self) -> None:
         """Initialize UI components with proper scaling."""

tests/test_frontend_tkinter_base_window.py

@@ -1757,6 +1757,42 @@ def test_calls_update_idletasks_before_positioning(self) -> None:
             winfo_idx = call_order.index("winfo_reqwidth")
             assert update_idx < winfo_idx, "update_idletasks should be called before dimension queries"
 
+    def test_uses_rendered_size_when_window_is_mapped(self) -> None:
+        """
+        Uses actual rendered window size (winfo_width/height) when window is already mapped.
+
+        GIVEN: A window that is already mapped and reports actual rendered dimensions via winfo_width/height
+        WHEN: Centering the window on screen
+        THEN: The rendered size should be used (not winfo_reqwidth/height) for correct centering
+        """
+        with patch("ardupilot_methodic_configurator.frontend_tkinter_base_window.get_monitors") as mock_monitors:
+            # Arrange: Single 1920x1080 monitor at origin
+            monitor = MagicMock()
+            monitor.x = 0
+            monitor.y = 0
+            monitor.width = 1920
+            monitor.height = 1080
+            mock_monitors.return_value = [monitor]
+
+            # Mock window: winfo_width/height return actual rendered size (> 1),
+            # winfo_reqwidth/height return different (content-based) values
+            mock_window = MagicMock()
+            mock_window.winfo_width.return_value = 450   # actual rendered width
+            mock_window.winfo_height.return_value = 350  # actual rendered height
+            mock_window.winfo_reqwidth.return_value = 300   # content size (should NOT be used)
+            mock_window.winfo_reqheight.return_value = 200  # content size (should NOT be used)
+            mock_window.winfo_pointerx.return_value = 960
+            mock_window.winfo_pointery.return_value = 540
+
+            # Act: Center window on screen
+            BaseWindow.center_window_on_screen(mock_window)
+
+            # Assert: Rendered sizes (450x350) are used, not content sizes (300x200)
+            # Center calculation using rendered size: x = (1920 - 450) / 2 = 735
+            #                                         y = (1080 - 350) / 2 = 365
+            mock_window.geometry.assert_called_once_with("+735+365")
+            mock_window.update.assert_called_once()
+
 
 if __name__ == "__main__":
     pytest.main([__file__])

tests/test_frontend_tkinter_progress_window.py

@@ -277,11 +277,20 @@ def test_user_sees_fc_init_progress_centered_on_screen_when_parent_is_withdrawn(
                 only_show_when_update_progress_called=True,
             )
 
+            # Ignore any centering that may have happened during __init__
+            mock_center_screen.reset_mock()
+            mock_center_parent.reset_mock()
+
+            # First time the window is actually shown via update_progress_bar
             window.update_progress_bar(10, 100)
 
-            # Screen centering should be used, not parent-relative
-            assert mock_center_screen.call_count >= 1
+            # Screen centering should be used exactly once, not parent-relative, when showing via update_progress_bar
+            mock_center_screen.assert_called_once()
             mock_center_parent.assert_not_called()
 
+            # The created progress window should be the one being centered
+            args, _ = mock_center_screen.call_args
+            assert window.progress_window in args
+
             with contextlib.suppress(Exception):
                 window.destroy()