[connections] window, topbar: Make the window corners rounded



commit d1c1aa7205c8bbed8406824f147d3c0b072492b9
Author: Roshan R Chandar <roshan cet ac in>
Date:   Fri Sep 10 09:54:06 2021 +0000

    window, topbar: Make the window corners rounded
    
    By using HdyApplicationWindow we get rounded corners for free.
    
    Fixes #68

 src/topbar.vala  |   2 +-
 src/ui/topbar.ui |   2 +-
 src/ui/window.ui | 130 ++++++++++++++++++++++++++++---------------------------
 src/window.vala  |   2 +-
 4 files changed, 69 insertions(+), 67 deletions(-)
---
diff --git a/src/topbar.vala b/src/topbar.vala
index bdabcd2..2afc5cd 100644
--- a/src/topbar.vala
+++ b/src/topbar.vala
@@ -23,7 +23,7 @@ namespace Connections {
     [GtkTemplate (ui = "/org/gnome/Connections/ui/topbar.ui")]
     private class Topbar : Gtk.Stack {
         [GtkChild]
-        private unowned Gtk.HeaderBar collection_toolbar;
+        private unowned Hdy.HeaderBar collection_toolbar;
         [GtkChild]
         public unowned Gtk.Button search_button;
         [GtkChild]
diff --git a/src/ui/topbar.ui b/src/ui/topbar.ui
index 92e2199..ebf1cac 100644
--- a/src/ui/topbar.ui
+++ b/src/ui/topbar.ui
@@ -3,7 +3,7 @@
   <requires lib="gtk+" version="3.20"/>
     <template class="ConnectionsTopbar" parent="GtkStack">
       <child>
-        <object class="GtkHeaderBar" id="collection_toolbar">
+        <object class="HdyHeaderBar" id="collection_toolbar">
           <property name="visible">True</property>
           <property name="show-close-button">True</property>
           <property name="title" translatable="yes">Connections</property>
diff --git a/src/ui/window.ui b/src/ui/window.ui
index 75d6501..084d635 100644
--- a/src/ui/window.ui
+++ b/src/ui/window.ui
@@ -1,82 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.20"/>
-    <template class="ConnectionsWindow" parent="GtkApplicationWindow">
+    <template class="ConnectionsWindow" parent="HdyApplicationWindow">
       <property name="default-width">980</property>
       <property name="default-height">640</property>
       <signal name="key-press-event" after="yes" handler="on_key_pressed"/>
       <signal name="delete-event" handler="on_delete_event"/>
-    <child type="titlebar">
-      <object class="ConnectionsTopbar" id="topbar">
-        <property name="visible">True</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
 
-        <child>
-          <object class="GtkSearchBar" id="search_bar">
-            <property name="visible">True</property>
-          </object>
-        </child>
+      <child>
+        <object class="GtkBox">
+          <property name="visible">True</property>
+          <property name="orientation">vertical</property>
+  
+          <child>
+            <object class="ConnectionsTopbar" id="topbar">
+              <property name="visible">True</property>
+            </object>
+          </child>
+          
+          <child>
+            <object class="GtkSearchBar" id="search_bar">
+              <property name="visible">True</property>
+            </object>
+          </child>
 
-        <child>
-          <object class="GtkOverlay" id="notification_overlay">
-            <property name="visible">True</property>
+          <child>
+            <object class="GtkOverlay" id="notification_overlay">
+              <property name="visible">True</property>
 
-            <child type="overlay">
-              <object class="ConnectionsNotificationsBar" id="notifications_bar">
-                <property name="visible">True</property>
-              </object>
-            </child>
+              <child type="overlay">
+                <object class="ConnectionsNotificationsBar" id="notifications_bar">
+                  <property name="visible">True</property>
+                </object>
+              </child>
 
-            <child>
-              <object class="GtkStack" id="stack">
-                <property name="visible">True</property>
+              <child>
+                <object class="GtkStack" id="stack">
+                  <property name="visible">True</property>
 
-                <child>
-                  <object class="ConnectionsCollectionView" id="collection_view">
-                    <property name="visible">True</property>
-                  </object>
-                </child>
+                  <child>
+                    <object class="ConnectionsCollectionView" id="collection_view">
+                      <property name="visible">True</property>
+                    </object>
+                  </child>
 
-                <child>
-                  <object class="ConnectionsEmptyView" id="empty_view">
-                    <property name="visible">True</property>
-                  </object>
-                </child>
+                  <child>
+                    <object class="ConnectionsEmptyView" id="empty_view">
+                      <property name="visible">True</property>
+                    </object>
+                  </child>
 
-                <child>
-                  <object class="ConnectionsDisplayView" id="display_view">
-                    <property name="visible">True</property>
-                  </object>
-                </child>
+                  <child>
+                    <object class="ConnectionsDisplayView" id="display_view">
+                      <property name="visible">True</property>
+                    </object>
+                  </child>
 
-                <child>
-                  <object class="GtkBox" id="loading_view">
-                    <property name="visible">True</property>
-                    <property name="expand">True</property>
+                  <child>
+                    <object class="GtkBox" id="loading_view">
+                      <property name="visible">True</property>
+                      <property name="expand">True</property>
 
-                    <child>
-                      <object class="GtkSpinner">
-                        <property name="visible">True</property>
-                        <property name="active">True</property>
-                        <property name="width-request">32</property>
-                        <property name="height-request">32</property>
-                      </object>
-                      <packing>
-                        <property name="expand">True</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
+                      <child>
+                        <object class="GtkSpinner">
+                          <property name="visible">True</property>
+                          <property name="active">True</property>
+                          <property name="width-request">32</property>
+                          <property name="height-request">32</property>
+                        </object>
+                        <packing>
+                          <property name="expand">True</property>
+                        </packing>
+                      </child>
+                    </object>
+                  </child>
+                </object>
+              </child>
+            </object>
+          </child>
+        </object>
+      </child>
     </template>
   </interface>
diff --git a/src/window.vala b/src/window.vala
index e81fef6..8f0637c 100644
--- a/src/window.vala
+++ b/src/window.vala
@@ -21,7 +21,7 @@
 
 namespace Connections {
     [GtkTemplate (ui = "/org/gnome/Connections/ui/window.ui")]
-    private class Window : Gtk.ApplicationWindow {
+    private class Window : Hdy.ApplicationWindow {
         [GtkChild]
         private unowned Topbar topbar;
 


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