[fractal] room_settings: Remove GtkFrame for notifications



commit 1b88797b30f3cb64e0eca71613659042e4e0c255
Author: Christopher Davis <brainblasted disroot org>
Date:   Mon Oct 12 19:02:27 2020 -0700

    room_settings: Remove GtkFrame for notifications
    
    Allows for more CSS cleanup and re-use of libhandy
    styles.

 fractal-gtk/res/app.css             |  8 -----
 fractal-gtk/res/ui/room_settings.ui | 65 +++++++++++++++----------------------
 2 files changed, 27 insertions(+), 46 deletions(-)
---
diff --git a/fractal-gtk/res/app.css b/fractal-gtk/res/app.css
index 89246bbe..586a4f15 100644
--- a/fractal-gtk/res/app.css
+++ b/fractal-gtk/res/app.css
@@ -129,14 +129,6 @@ frame.room-directory > border {
   color: @theme_selected_bg_color;
 }
 
-.room-settings-frame > border {
-  border-radius: 9px;
-}
-
-.room-settings-frame > list {
-  border-radius: 9px;
-}
-
 row:not(:selected) .member-uid {
   color: @insensitive_fg_color;
 }
diff --git a/fractal-gtk/res/ui/room_settings.ui b/fractal-gtk/res/ui/room_settings.ui
index 17286652..8d2f3cae 100644
--- a/fractal-gtk/res/ui/room_settings.ui
+++ b/fractal-gtk/res/ui/room_settings.ui
@@ -242,65 +242,54 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkFrame">
+                          <object class="GtkListBox">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="margin_bottom">24</property>
                             <child>
-                              <object class="GtkListBox">
+                              <object class="GtkListBoxRow">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="activatable">False</property>
+                                <property name="selectable">False</property>
                                 <child>
-                                  <object class="GtkListBoxRow">
+                                  <object class="GtkBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="activatable">False</property>
-                                    <property name="selectable">False</property>
+                                    <property name="orientation">horizontal</property>
+                                    <property name="margin">20</property>
                                     <child>
-                                      <object class="GtkBox">
+                                      <object class="GtkLabel">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Notifications</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkSwitch" id="room_settings_notification_switch">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="orientation">horizontal</property>
-                                        <property name="margin">20</property>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" 
translatable="yes">Notifications</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkSwitch" id="room_settings_notification_switch">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="fill">True</property>
-                                            <property name="position">0</property>
-                                            <property name="pack_type">end</property>
-                                          </packing>
-                                        </child>
                                       </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                        <property name="pack_type">end</property>
+                                      </packing>
                                     </child>
                                   </object>
                                 </child>
                               </object>
                             </child>
                             <style>
-                              <class name="room-settings-frame"/>
+                              <class name="content"/>
                             </style>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">6</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkFrame" id="room_settings_notification_sounds">


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