From 663a7629bf429714fdd2464b9144cd381ff63405 Mon Sep 17 00:00:00 2001 From: Hans Unzner Date: Thu, 4 Jan 2024 17:04:39 +0100 Subject: [PATCH 1/2] gmoccapy: fix "window does not fit 1024x768 in fullscreen" Problem: The button tbtn_switch_mode was displayed together with its placeholder label, so there was one button too much when the windows was created. --- src/emc/usr_intf/gmoccapy/gmoccapy.glade | 1 - 1 file changed, 1 deletion(-) diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.glade b/src/emc/usr_intf/gmoccapy/gmoccapy.glade index d11abd881d..38a5cb27c0 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.glade +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.glade @@ -6206,7 +6206,6 @@ Mode False 90 56 - True True True Switch motion mode between Joint and World mode From e1438a7344d6009d02eac93d9d8efaadb0b740a3 Mon Sep 17 00:00:00 2001 From: Hans Unzner Date: Thu, 4 Jan 2024 17:17:44 +0100 Subject: [PATCH 2/2] gmoccapy: remember window size and position when switching back from fullscreen/maximized --- src/emc/usr_intf/gmoccapy/gmoccapy.py | 22 ++++++++++----------- src/emc/usr_intf/gmoccapy/release_notes.txt | 4 ++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/emc/usr_intf/gmoccapy/gmoccapy.py b/src/emc/usr_intf/gmoccapy/gmoccapy.py index ae82be614b..4ff9c7f5e5 100644 --- a/src/emc/usr_intf/gmoccapy/gmoccapy.py +++ b/src/emc/usr_intf/gmoccapy/gmoccapy.py @@ -76,7 +76,7 @@ def excepthook(exc_type, exc_obj, exc_tb): # constants # # gmoccapy #" -_RELEASE = " 3.4.7" +_RELEASE = " 3.4.7.1" _INCH = 0 # imperial units are active _MM = 1 # metric units are active @@ -220,7 +220,7 @@ def __init__(self, argv): self.xpos = 40 # The X Position of the main Window self.ypos = 30 # The Y Position of the main Window - self.width = 979 # The width of the main Window + self.width = 980 # The width of the main Window self.height = 750 # The height of the main Window self.gcodeerror = "" # we need this to avoid multiple messages of the same error @@ -2913,20 +2913,20 @@ def on_window1_show(self, widget, data=None): self.widgets[start_as].set_active(True) self.widgets.window1.set_decorated(not self.prefs.getpref("hide_titlebar", False, bool)) self.widgets.chkbtn_hide_titlebar.set_active(not self.widgets.window1.get_decorated()) + self.xpos = int(self.prefs.getpref("x_pos", self.xpos, float)) + self.ypos = int(self.prefs.getpref("y_pos", self.ypos, float)) + self.width = int(self.prefs.getpref("width", self.width, float)) + self.height = int(self.prefs.getpref("height", self.height, float)) + # set the adjustments according to Window position and size + self.widgets.adj_x_pos.set_value(self.xpos) + self.widgets.adj_y_pos.set_value(self.ypos) + self.widgets.adj_width.set_value(self.width) + self.widgets.adj_height.set_value(self.height) if start_as == "rbtn_fullscreen": self.widgets.window1.fullscreen() elif start_as == "rbtn_maximized": self.widgets.window1.maximize() else: - self.xpos = int(self.prefs.getpref("x_pos", 40, float)) - self.ypos = int(self.prefs.getpref("y_pos", 30, float)) - self.width = int(self.prefs.getpref("width", 979, float)) - self.height = int(self.prefs.getpref("height", 750, float)) - # set the adjustments according to Window position and size - self.widgets.adj_x_pos.set_value(self.xpos) - self.widgets.adj_y_pos.set_value(self.ypos) - self.widgets.adj_width.set_value(self.width) - self.widgets.adj_height.set_value(self.height) # move and resize the window self.widgets.window1.move(self.xpos, self.ypos) self.widgets.window1.resize(self.width, self.height) diff --git a/src/emc/usr_intf/gmoccapy/release_notes.txt b/src/emc/usr_intf/gmoccapy/release_notes.txt index c0e7d1fd21..a1cedf5f1c 100644 --- a/src/emc/usr_intf/gmoccapy/release_notes.txt +++ b/src/emc/usr_intf/gmoccapy/release_notes.txt @@ -1,3 +1,7 @@ +ver 3.4.7.1 + - Remember window size and position when switching back from fullscreen/maximized + - Fix "window does not fit 1024x768 in fullscreen" + ver 3.4.7 - Added setting to allow smaller width of virtual keyboard (for widescreens) - Fixed box_dro_side is displayed in the G-code editor (#2627)