Merge pull request #425 from aclist/fix/flickering-cancel-button

fix: flickering cancel button
Merge pull request #424 from aclist/fix/options-web-button
2026-11-02 08:02:44 +01:00 · 2026-07-28 17:12:43 +09:00 · 2026-07-28 17:11:45 +09:00 · 2026-07-28 17:11:15 +09:00 · 2026-07-28 16:40:01 +09:00 · 2026-07-27 23:19:23 +09:00
3 changed files with 13 additions and 21 deletions
@@ -305,7 +305,7 @@ class Options:
    force_eventbox: str
    self_update: str
    no_self_update: str
-    api_keys: str
+    api_key: str
    prefs: str
    mods: str
    version: str
@@ -402,7 +402,7 @@ options = Options(
        "In-app updates are disabled when DZGUI is "
        "installed globally (e.g., via package manager)."
    ),
-    api_keys="API Keys",
+    api_key="API Key",
    prefs="Preferences",
    mods="Mods",
    version="Version",
@@ -111,19 +111,22 @@ class WaitDialog(GenericDialog):

        self.connect("delete-event", lambda widget, event: True)
        content = self.get_content_area()
-        spinner = Gtk.Spinner()
        self.prog = Gtk.ProgressBar()

-        content.pack_end(self.cancel, NO_EXPAND, NO_FILL, 0)
-        content.pack_end(spinner, NO_EXPAND, NO_FILL, 0)
+        spinner_box = Gtk.Box(
+            orientation=Gtk.Orientation.HORIZONTAL, halign=Gtk.Align.CENTER
+        )
+        spinner = Gtk.Spinner()
+        spinner_box.add(spinner)

        if self.jobs > 1:
-            content.pack_end(self.prog, NO_EXPAND, NO_FILL, 0)
+            content.pack_start(self.prog, NO_EXPAND, NO_FILL, 0)
        else:
+            content.pack_start(spinner_box, NO_EXPAND, NO_FILL, 0)
            spinner.start()

-        if show_cancel is False:
-            self.connect("realize", lambda _: self.cancel.set_visible(False))
+        if show_cancel is True:
+            content.pack_start(self.cancel, NO_EXPAND, NO_FILL, 0)

    def update_text(self, msg: str) -> None:
        self.format_secondary_text(msg)
@@ -74,7 +74,7 @@ class Options(Gtk.Box):
            strings.options.enter_steam, Preferences.STEAM, True
        )
        api_rows = [
-            [LeftLabel(strings.options.steam_placeholder), self.steam_box],
+            [LeftLabel(strings.options.steam_placeholder), self.steam_box, self.steam],
        ]

        self.player_box = self._make_submit_field(
@@ -136,17 +136,6 @@ class Options(Gtk.Box):
        api_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
        api_grid = self._make_grid(api_rows)
        api_box.add(api_grid)
-        api_links_box = Gtk.Box(
-            orientation=Gtk.Orientation.HORIZONTAL,
-            margin_start=5,
-            margin_end=5,
-            margin_top=5,
-            margin_bottom=10,
-            homogeneous=True,
-            spacing=10,
-        )
-        api_links_box.add(self.steam)
-        api_box.add(api_links_box)

        prefs_grid = self._make_grid(pref_rows)
        version_grid = self._make_grid(version_rows)
@@ -167,7 +156,7 @@ class Options(Gtk.Box):
            grid.attach(developers, 1, 0, self.DEFAULT_WIDTH, self.DEFAULT_HEIGHT)

        for pair in [
-            (api_box, strings.options.api_keys),
+            (api_box, strings.options.api_key),
            (prefs_grid, strings.options.prefs),
            (version_grid, strings.options.version),
        ]:
Author	SHA1	Message	Date
aclist	c947bc2c9b	Merge pull request #425 from aclist/fix/flickering-cancel-button Mirror to Codeberg / mirror-to-codeberg (push) Has been cancelled Details fix: flickering cancel button	2026-07-28 17:12:43 +09:00
aclist	06315972b1	Merge pull request #424 from aclist/fix/options-web-button chore: normalize position of web button following BM API drop	2026-07-28 17:11:45 +09:00
aclist	4e36824ed7	Merge pull request #423 from aclist/fix/lockstep-history fix: maintain lockstep with history file (#362)	2026-07-28 17:11:15 +09:00
aclist	db8b1acbc6	fix: pack spinner in dedicated box Resolves #357. Spinner and cancel button occupied the same region of the content area, causing spinner repaint events on each frame to redraw the cancel button, triggering a flickering effect.	2026-07-28 16:40:01 +09:00
aclist	1e5d66c9be	chore: change alignment property to hold future items	2026-07-27 23:19:23 +09:00
aclist	202620c062	chore: normalize position of web button following BM API drop	2026-07-27 23:17:49 +09:00