[gnome-todo] window: Remove headerbar box



commit 60cd46d3e6a12abbb1fd7d78e06c7b5022e27bd3
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Sep 14 14:41:25 2021 -0300

    window: Remove headerbar box
    
    It's a relic from when we had fullscreening.

 src/gui/gtd-window.c  |  2 --
 src/gui/gtd-window.ui | 72 ++++++++++++++++++++++++---------------------------
 2 files changed, 34 insertions(+), 40 deletions(-)
---
diff --git a/src/gui/gtd-window.c b/src/gui/gtd-window.c
index cd9dcff5..279648e9 100644
--- a/src/gui/gtd-window.c
+++ b/src/gui/gtd-window.c
@@ -60,7 +60,6 @@ struct _GtdWindow
   AdwApplicationWindow application;
 
   AdwHeaderBar       *headerbar;
-  GtkBox             *headerbar_box;
   GtkStack           *stack;
   GtkMenuButton      *primary_menu_button;
   GtkBox             *workspace_box_end;
@@ -561,7 +560,6 @@ gtd_window_class_init (GtdWindowClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/todo/ui/gtd-window.ui");
 
   gtk_widget_class_bind_template_child (widget_class, GtdWindow, headerbar);
-  gtk_widget_class_bind_template_child (widget_class, GtdWindow, headerbar_box);
   gtk_widget_class_bind_template_child (widget_class, GtdWindow, notification_widget);
   gtk_widget_class_bind_template_child (widget_class, GtdWindow, primary_menu_button);
   gtk_widget_class_bind_template_child (widget_class, GtdWindow, stack);
diff --git a/src/gui/gtd-window.ui b/src/gui/gtd-window.ui
index 428fd54e..25545da1 100644
--- a/src/gui/gtd-window.ui
+++ b/src/gui/gtd-window.ui
@@ -29,45 +29,41 @@
             <property name="hexpand">true</property>
 
             <child>
-              <object class="GtkBox" id="headerbar_box">
+              <object class="AdwHeaderBar" id="headerbar">
+                <property name="hexpand">1</property>
+                <property name="show-end-title-buttons">1</property>
+
+                <!-- Workspace Button -->
+                <child>
+                  <object class="GtdMenuButton" id="workspaces_menu_button">
+                    <property name="visible">false</property>
+                    <property name="can_focus">1</property>
+                    <property name="popover">workspaces_popover</property>
+                  </object>
+                </child>
+
                 <child>
-                  <object class="AdwHeaderBar" id="headerbar">
-                    <property name="hexpand">1</property>
-                    <property name="show-end-title-buttons">1</property>
-
-                    <!-- Workspace Button -->
-                    <child>
-                      <object class="GtdMenuButton" id="workspaces_menu_button">
-                        <property name="visible">false</property>
-                        <property name="can_focus">1</property>
-                        <property name="popover">workspaces_popover</property>
-                      </object>
-                    </child>
-
-                    <child>
-                      <object class="GtkBox" id="workspace_box_start">
-                        <property name="spacing">6</property>
-                      </object>
-                    </child>
-
-                    <!-- Omni Area -->
-                    <child type="title">
-                      <object class="GtdOmniArea" id="omni_area">
-                      </object>
-                    </child>
-
-
-                    <child type="end">
-                      <object class="GtkMenuButton" id="primary_menu_button">
-                        <property name="icon-name">open-menu-symbolic</property>
-                      </object>
-                    </child>
-
-                    <child type="end">
-                      <object class="GtkBox" id="workspace_box_end">
-                        <property name="spacing">6</property>
-                      </object>
-                    </child>
+                  <object class="GtkBox" id="workspace_box_start">
+                    <property name="spacing">6</property>
+                  </object>
+                </child>
+
+                <!-- Omni Area -->
+                <child type="title">
+                  <object class="GtdOmniArea" id="omni_area">
+                  </object>
+                </child>
+
+
+                <child type="end">
+                  <object class="GtkMenuButton" id="primary_menu_button">
+                    <property name="icon-name">open-menu-symbolic</property>
+                  </object>
+                </child>
+
+                <child type="end">
+                  <object class="GtkBox" id="workspace_box_end">
+                    <property name="spacing">6</property>
                   </object>
                 </child>
               </object>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]