Skip to content

Commit 4adc90c

Browse files
committed
enable window resizing on Mac
1 parent a5eae3b commit 4adc90c

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/navigate/controller/controller.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ def __init__(
152152

153153
#: Tk top-level widget: Tk.tk GUI instance.
154154
self.root = root
155+
#: bool: Flag to indicate if the GUI is ready for resizing.
156+
self.resize_ready_flag = False
155157

156158
#: Tk top-level widget: Tk.tk GUI instance.
157159
self.splash_screen = splash_screen
@@ -346,12 +348,10 @@ def __init__(
346348

347349
#: int: ID for the resize event.Only works on Windows OS.
348350
self.resize_event_id = None
349-
self.resize_ready_flag = False
350351
self.window_width = 0
351352
self.window_height = 0
352353
self.view.root.after(5000, self.enable_resize)
353-
if platform.system() == "Windows":
354-
self.view.root.bind("<Configure>", self.resize)
354+
self.view.root.bind("<Configure>", self.resize)
355355

356356
def update_buffer(self):
357357
"""Update the buffer size according to the camera

src/navigate/controller/sub_controllers/camera_view.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ def resize(self, event: tk.Event) -> None:
978978
width = max(
979979
w_width - left_width - 16, 560 + self.view.lut.winfo_width()
980980
)
981-
height = max(w_height - top_height - 38, 670)
981+
height = max(w_height - top_height - 50, 670)
982982
else:
983983
width = event.width
984984
height = event.height - 24
@@ -1010,6 +1010,9 @@ def refresh(self, width: int, height: int) -> None:
10101010
if widget != self.view.canvas:
10111011
if self.view.is_docked or widget.winfo_ismapped():
10121012
widget_height += widget.winfo_height() + 5
1013+
if widget.winfo_height() < 30:
1014+
widget_height += 30
1015+
10131016
self.canvas_height = (
10141017
height - widget_height - (50 if self.view.is_docked else -5)
10151018
)
@@ -1113,8 +1116,7 @@ def __init__(self, view, parent_controller=None) -> None:
11131116
# Slider Binding
11141117
self.view.slider.bind("<Motion>", self.slider_update)
11151118

1116-
if platform.system() == "Windows":
1117-
self.resize_event_id = self.view.bind("<Configure>", self.resize)
1119+
self.resize_event_id = self.view.bind("<Configure>", self.resize)
11181120

11191121
#: str: The display state.
11201122
self.display_state = "Live"
@@ -1472,8 +1474,7 @@ def __init__(self, view, parent_controller=None) -> None:
14721474
#: dict: The render widgets.
14731475
self.render_widgets = self.view.render.get_widgets()
14741476

1475-
if platform.system() == "Windows":
1476-
self.resize_event_id = self.view.bind("<Configure>", self.resize)
1477+
self.resize_event_id = self.view.bind("<Configure>", self.resize)
14771478

14781479
#: bool: The display enabled flag.
14791480
self.display_enabled = tk.BooleanVar()

0 commit comments

Comments
 (0)