jiriks74/dztui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2025-04-04 11:33:01 +02:00
Code Issues Wiki Activity Actions

fix: quit signal being blocked in fullscreen

Browse source
This commit is contained in:
aclist 2025-03-15 12:09:51 +09:00
parent df872fa4e7
commit 52961755ff
1 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
helpers/ui.py
View file

@ -875,21 +875,26 @@ class OuterWindow(Gtk.Window):
self.add(self.grid) self.add(self.grid)
if is_game_mode is True: if is_game_mode is True:
self.fullscreen() self.fullscreen()
elif query_config(None, "fullscreen")[0] == "true":
logger.info("User preference for 'fullscreen' is 'true'")
self.maximize()
else: else:
if query_config(None, "fullscreen")[0] == "true": if os.path.isfile(res_path):
self.maximize() with open(res_path, "r") as infile:
try:
if os.path.isfile(res_path): data = json.load(infile)
with open(res_path, "r") as infile: valid_json = True
try: except json.decoder.JSONDecodeError:
data = json.load(infile) logger.critical("JSON decode error in '%s'" %(geometry_path))
valid_json = True valid_json = False
except json.decoder.JSONDecodeError: else:
logger.critical("JSON decode error in '%s'" %(geometry_path)) valid_json = False
valid_json = False if valid_json:
res = data["res"]
if valid_json: w = res["width"]
self.set_default_size(data["res"]["width"], data["res"]["height"]) h = res["height"]
logger.info("Restoring window size to %s,%s" %(w,h))
self.set_default_size(w, h)
self.show_all() self.show_all()
# Hide FilterPanel on main menu # Hide FilterPanel on main menu
@ -2466,6 +2471,7 @@ class App(Gtk.Application):
def save_res_and_quit(window): def save_res_and_quit(window):
if window.props.is_maximized: if window.props.is_maximized:
Gtk.main_quit()
return return
rect = window.get_size() rect = window.get_size()
@ -2474,7 +2480,7 @@ def save_res_and_quit(window):
j = json.dumps(data, indent=2) j = json.dumps(data, indent=2)
with open(res_path, "w") as outfile: with open(res_path, "w") as outfile:
outfile.write(j) outfile.write(j)
logger.info("Wrote initial column widths to '%s'" %(res_path)) logger.info("Wrote initial window size to '%s'" %(res_path))
if os.path.isfile(res_path): if os.path.isfile(res_path):
with open(res_path, "r") as infile: with open(res_path, "r") as infile: