gtk4: Fix visibility regression with actionbar

Previously, the actionbar will always be visible. It should have not been that. Instead, it should only appear when the screen is small. tchx84#464 (comment) Signed-off-by: Fiana Fortressia <fortressnordlys@outlook.com>
A6GibKm · Apr 1, 2023 · 6b7cd57 · 6b7cd57
1 parent ff3eb35
commit 6b7cd57
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/widgets/window.js b/src/widgets/window.js
@@ -112,8 +112,10 @@ var FlatsealWindow = GObject.registerClass({
         this._contentLeaflet.connect('notify::visible-child-name', this._focusContent.bind(this));
         this._contentLeaflet.bind_property(
             'folded', this._backButton, 'visible', _bindReadFlags);
-        this._permissionsHeaderBar.connect_after(
-            'size-allocate', this._updateVisibility.bind(this));
+        this.root.connect(
+            'notify::default-width', this._updateVisibility.bind(this));
+        this.connect(
+            'notify::maximized', this._updateVisibility.bind(this));
 
         if (allApplications.length === 0 || allPermissions.length === 0)
             return;
@@ -307,13 +309,20 @@ var FlatsealWindow = GObject.registerClass({
         return GLib.SOURCE_REMOVE;
     }
 
-    _updateVisibility(window, allocation) {
-        const visible = window.root.default_width <= ACTION_BAR_THRESHOLD;
+    _updateVisibility(window) {
+        if (window.maximized) {
+            this._detailsHeaderButton.visible = true;
+            this._resetHeaderButton.visible = true;
 
-        this._detailsHeaderButton.visible = !visible;
-        this._resetHeaderButton.visible = !visible;
+            this._actionBar.visible = false;
+        } else {
+            const visible = window.root.default_width <= ACTION_BAR_THRESHOLD;
+
+            this._detailsHeaderButton.visible = !visible;
+            this._resetHeaderButton.visible = !visible;
 
-        this._actionBar.visible = visible;
+            this._actionBar.visible = visible;
+        }
     }
 
     _filter(row) {

diff --git a/src/widgets/window.ui b/src/widgets/window.ui
@@ -152,7 +152,7 @@
                                                     <child>
                                                       <object class="GtkImage">
                                                         <property name="icon-name">system-search-symbolic</property>
-                                                        <property name="icon_size">6</property>
+                                                        <property name="icon_size">normal</property>
                                                       </object>
                                                     </child>
                                                     <child>
@@ -300,6 +300,7 @@
                                         </child>
                                         <child>
                                           <object class="GtkActionBar" id="actionBar">
+                                            <property name="visible">False</property>
                                             <child>
                                               <object class="GtkBox" id="startActionBox">
                                                 <property name="valign">center</property>