Skip to content

Commit 913e1e8

Browse files
committed
Open new design with tk.Tk and fix toplevel initial dimensions
1 parent 5050d30 commit 913e1e8

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

studio/feature/design.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ def _open_default(self):
217217
width = max(self.width - self._padding * 2, 300)
218218
height = max(self.height - self._padding * 2, 300)
219219
self.add(
220-
legacy.Toplevel, self._padding, self._padding,
220+
legacy.Tk, self._padding, self._padding,
221221
width=width, height=height
222222
)
223223
self.builder.generate()
@@ -468,14 +468,13 @@ def add(self, obj_class: PseudoWidget.__class__, x, y, **kwargs):
468468
silent = kwargs.get("silently", False)
469469
name = self._get_unique(obj_class)
470470
obj = obj_class(self, name)
471-
if hasattr(obj, 'initial_dimensions'):
472-
width, height = obj.initial_dimensions
473-
else:
474-
width = kwargs.get(
475-
"width",
476-
self._base_font.measure(name) + self.WIDGET_INIT_PADDING
477-
)
478-
height = kwargs.get("height", self.WIDGET_INIT_HEIGHT)
471+
width, height = getattr(obj, "initial_dimensions", (
472+
self._base_font.measure(name) + self.WIDGET_INIT_PADDING,
473+
self.WIDGET_INIT_HEIGHT
474+
))
475+
width = kwargs.get("width", width)
476+
height = kwargs.get("height", height)
477+
479478
obj.layout = kwargs.get("intended_layout", None)
480479
self._attach(obj) # apply extra bindings required
481480
# If the object has a layout which actually the layout at the point of creation prepare and pass it

studio/lib/toplevel.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ def _clear_hooks():
159159

160160

161161
class _Toplevel(tk.Frame):
162-
impl = tk.Toplevel
163162
_images = None
164163

165164
def __init__(self, master, id_):
@@ -452,6 +451,7 @@ class Toplevel(ToplevelContainer, _Toplevel):
452451
is_toplevel = True
453452
display_name = 'Toplevel'
454453
impl = tk.Toplevel
454+
initial_dimensions = 200, 230
455455

456456

457457
class Tk(ToplevelContainer, _Toplevel):
@@ -460,3 +460,4 @@ class Tk(ToplevelContainer, _Toplevel):
460460
is_toplevel = True
461461
display_name = 'Tk'
462462
impl = tk.Tk
463+
initial_dimensions = 200, 230

studio/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import time
99
import tkinter
1010
import webbrowser
11-
from tkinter import filedialog, Toplevel
11+
from tkinter import filedialog
1212

1313
import tkinterDnD
1414

0 commit comments

Comments
 (0)