Changeset 1202 for framspy/gui/widgets

Timestamp:

02/08/23 01:19:53 (23 months ago)

Author:

Maciej Komosinski

Message:

Introduced common utility functions for setting window sizes; untangled some repeated code

Location:

framspy/gui/widgets

Files:

• ConsoleWindow.py (modified) (2 diffs)
• mainPage.py (modified) (2 diffs)
• propertyWindow.py (modified) (2 diffs)

framspy/gui/widgets/ConsoleWindow.py

@@ -2 +2 @@
 from gui.widgets.ScrolledText import ScrolledText
 from gui.framsutils.FramsSocket import FramsSocket
+from gui.utils import windowHideAndMaximize, windowShowAndSetGeometry
 from typing import Tuple, Callable
 
@@ -45 +46 @@
             return maxwidth, maxheight, x, y
 
-        self.attributes("-alpha", 0)
         self.update_idletasks()
 
         width, height, x, y = parseGeometryString(self.winfo_geometry())
-
-        self.state('zoomed')
-        self.update()
+        windowHideAndMaximize(self)
         rootx = self.winfo_rootx()
-
         maxWidth, maxHeight, x, y = parseGeometryString(self.winfo_geometry())
-
-        self.state("normal")
-        self.update()
-
         x = (maxWidth - width) / 2
         y = (maxHeight - height) / 2
-
-        self.geometry("+%d+%d" % (int(rootx + x), int(y)))
-        self.attributes("-alpha", 1)
-        self.update()
+        windowShowAndSetGeometry(self, "+%d+%d" % (int(rootx + x), int(y)))
         self.maxsize(maxWidth, maxHeight)
 

framspy/gui/widgets/mainPage.py

@@ -16 +16 @@
 from gui.socketInterface import SocketInterface
 from gui.utils import debounce
+from gui.utils import windowHideAndMaximize, windowShowAndSetGeometry
 from gui.widgets.ToolTip import CreateToolTip
 from time import perf_counter
@@ -171 +172 @@
         #ORGANIZE WINDOWS POSITIONS
         ## need to do some workaround to determine screen width and height
-        self.attributes("-alpha", 0)
-        self.state('zoomed')
-        self.update()
+        windowHideAndMaximize(self)
         maxHeight = self.winfo_rooty() + self.winfo_height()
         maxWidth = self.winfo_rootx() + self.winfo_width()
         self.rootx = self.winfo_rootx()
-        self.state("normal")
-        self.update()
-        self.geometry("%dx%d+%d+%d" % (self.OPENGL_WIDTH + self.SIDEBAR_WIDTH, self.OPENGL_HEIGHT, self.rootx, 0))
-        self.attributes("-alpha", 1)
-        self.update()
+        windowShowAndSetGeometry(self, "%dx%d+%d+%d" % (self.OPENGL_WIDTH + self.SIDEBAR_WIDTH, self.OPENGL_HEIGHT, self.rootx, 0))
         height = self.winfo_rooty() + self.winfo_height() - self.winfo_y()
 

framspy/gui/widgets/propertyWindow.py

@@ -4 +4 @@
 from typing import Dict, List, Callable, Tuple
 from gui.framsutils.framsProperty import Property, PropertyCallback, propertyToTkinter
+from gui.framsutils.FramsInterface import FramsInterface, InterfaceType
 from gui.widgets.ToolTip import CreateToolTip
-from gui.framsutils.FramsInterface import FramsInterface, InterfaceType
+from gui.utils import windowHideAndMaximize, windowShowAndSetGeometry
 
 '''
@@ -105 +106 @@
             return maxwidth, maxheight, x, y
 
-        self.attributes("-alpha", 0)
         self.update_idletasks()
 
         width, height, x, y = parseGeometryString(self.winfo_geometry())
 
-        self.state('zoomed')
-        self.update()
+        windowHideAndMaximize(self)
         rootx = self.winfo_rootx()
 
         maxWidth, maxHeight, x, y = parseGeometryString(self.winfo_geometry())
-
-        self.state("normal")
-        self.update()
-
         x = (maxWidth - width) / 2
         y = (maxHeight - height) / 2
 
-        self.geometry("+%d+%d" % (int(rootx + x), int(y)))
-        self.attributes("-alpha", 1)
-        self.update()
+        windowShowAndSetGeometry(self, "+%d+%d" % (int(rootx + x), int(y)))
         self.maxsize(maxWidth, maxHeight)