[fractal] room_settings: Use libhandy style class instead of GtkFrame
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] room_settings: Use libhandy style class instead of GtkFrame
- Date: Wed, 21 Oct 2020 07:27:38 +0000 (UTC)
commit f3583b78672478f99ccd255bba9c2aa7790f609e
Author: Christopher Davis <brainblasted disroot org>
Date: Mon Oct 12 18:43:21 2020 -0700
room_settings: Use libhandy style class instead of GtkFrame
Allows us to cut out a bit of CSS
fractal-gtk/res/app.css | 14 ++------------
fractal-gtk/res/ui/room_settings.ui | 10 +---------
fractal-gtk/src/widgets/members_list.rs | 1 +
fractal-gtk/src/widgets/room_settings.rs | 2 +-
4 files changed, 5 insertions(+), 22 deletions(-)
---
diff --git a/fractal-gtk/res/app.css b/fractal-gtk/res/app.css
index c302f44c..89246bbe 100644
--- a/fractal-gtk/res/app.css
+++ b/fractal-gtk/res/app.css
@@ -137,18 +137,6 @@ frame.room-directory > border {
border-radius: 9px;
}
-.room-settings-frame > box {
- border-radius: 9px;
-}
-
-.room-settings-frame > box > list {
- border-radius: 9px;
-}
-
-.room-settings-frame > box > label {
- border-radius: 9px;
-}
-
row:not(:selected) .member-uid {
color: @insensitive_fg_color;
}
@@ -301,6 +289,8 @@ row .timestamp {
.no_member_search {
padding: 12px;
background: @theme_base_color;
+ border-radius: 8px;
+ border: 1px solid @borders;
}
.message-input {
diff --git a/fractal-gtk/res/ui/room_settings.ui b/fractal-gtk/res/ui/room_settings.ui
index 38a8eb81..17286652 100644
--- a/fractal-gtk/res/ui/room_settings.ui
+++ b/fractal-gtk/res/ui/room_settings.ui
@@ -979,18 +979,10 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="room_settings_members_list">
+ <object class="GtkBox" id="room_settings_members_list">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <style>
- <class name="room-settings-frame"/>
- </style>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
diff --git a/fractal-gtk/src/widgets/members_list.rs b/fractal-gtk/src/widgets/members_list.rs
index 27d40433..0e142016 100644
--- a/fractal-gtk/src/widgets/members_list.rs
+++ b/fractal-gtk/src/widgets/members_list.rs
@@ -47,6 +47,7 @@ impl MembersList {
self.members.clone(),
self.admins.clone(),
);
+ self.container.get_style_context().add_class("content");
self.error.get_style_context().add_class("no_member_search");
self.error.set_text(&i18n("No matching members found"));
b.pack_start(&self.error, true, true, 0);
diff --git a/fractal-gtk/src/widgets/room_settings.rs b/fractal-gtk/src/widgets/room_settings.rs
index 132ec785..878a2873 100644
--- a/fractal-gtk/src/widgets/room_settings.rs
+++ b/fractal-gtk/src/widgets/room_settings.rs
@@ -655,7 +655,7 @@ impl RoomSettings {
.expect("Can't find room_settings_members_search in ui file.");
let b = self
.builder
- .get_object::<gtk::Frame>("room_settings_members_list")
+ .get_object::<gtk::Box>("room_settings_members_list")
.expect("Can't find room_settings_members_list in ui file.");
let label = self
.builder
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]