Port to libadwaita 1.7

1 year ago · af780758e9
25 changed files with 35 additions and 35 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -58,7 +58,7 @@ webp = { version = "0.3", default-features = false }
 zeroize = "1"

 # gtk-rs project and dependents. These usually need to be updated together.
-adw = { package = "libadwaita", version = "0.7", features = ["v1_6"] }
+adw = { package = "libadwaita", version = "0.7", features = ["v1_7"] }
 glycin = { version = "2", default-features = false, features = ["tokio", "gdk4"] }
 gst = { version = "0.23", package = "gstreamer" }
 gst_app = { version = "0.23", package = "gstreamer-app" }
--- a/data/resources/stylesheet/_session_view.scss
+++ b/data/resources/stylesheet/_session_view.scss
@ -157,7 +157,7 @@ sidebar {
        color: var(--accent-color);
      }

-      .dim-label, &.drop-empty .dim-label {
+      .dimmed, &.drop-empty .dimmed {
        opacity: 1;
      }
    }
--- a/meson.build
+++ b/meson.build
@ -22,7 +22,7 @@ full_version = version
 dependency('glib-2.0', version: '>= 2.76') # update when changing gtk version
 dependency('gio-2.0', version: '>= 2.76') # always same version as glib
 dependency('gtk4', version: '>= 4.16')
-dependency('libadwaita-1', version: '>= 1.6')
+dependency('libadwaita-1', version: '>= 1.7')

 # Please keep these dependencies sorted.
 dependency('gstreamer-1.0', version: '>= 1.20')
--- a/src/account_chooser_dialog/account_row.ui
+++ b/src/account_chooser_dialog/account_row.ui
@ -25,7 +25,7 @@
                <property name="xalign">0.0</property>
                <property name="hexpand">True</property>
                <style>
-                  <class name="dim-label"/>
+                  <class name="dimmed"/>
                  <class name="caption"/>
                </style>
              </object>
--- a/src/account_switcher/session_item.ui
+++ b/src/account_switcher/session_item.ui
@ -30,7 +30,7 @@
                <property name="hexpand">True</property>
                <property name="ellipsize">end</property>
                <style>
-                  <class name="dim-label"/>
+                  <class name="dimmed"/>
                  <class name="caption"/>
                </style>
              </object>
--- a/src/components/dialogs/join_room.ui
+++ b/src/components/dialogs/join_room.ui
@ -150,7 +150,7 @@
                                <property name="wrap-mode">word-char</property>
                                <property name="justify">center</property>
                                <style>
-                                  <class name="dim-label"/>
+                                  <class name="dimmed"/>
                                </style>
                              </object>
                            </child>
@ -172,14 +172,14 @@
                                    <property name="icon-name">users-symbolic</property>
                                    <property name="accessible-role">presentation</property>
                                    <style>
-                                      <class name="dim-label"/>
+                                      <class name="dimmed"/>
                                    </style>
                                  </object>
                                </child>
                                <child>
                                  <object class="GtkLabel" id="room_members_count">
                                    <style>
-                                      <class name="dim-label"/>
+                                      <class name="dimmed"/>
                                    </style>
                                  </object>
                                </child>
--- a/src/components/pill/source_row.ui
+++ b/src/components/pill/source_row.ui
@ -42,7 +42,7 @@
                  </lookup>
                </binding>
                <style>
-                  <class name="dim-label"/>
+                  <class name="dimmed"/>
                  <class name="caption"/>
                </style>
              </object>
--- a/src/components/rows/substring_entry_row.ui
+++ b/src/components/rows/substring_entry_row.ui
@ -39,7 +39,7 @@
                  <object class="GtkLabel" id="entry_prefix_label">
                    <property name="label">#</property>
                    <style>
-                      <class name="dim-label"/>
+                      <class name="dimmed"/>
                    </style>
                  </object>
                </child>
@ -75,7 +75,7 @@
                  <object class="GtkLabel" id="entry_suffix_label">
                    <property name="label">:matrix.org</property>
                    <style>
-                      <class name="dim-label"/>
+                      <class name="dimmed"/>
                    </style>
                  </object>
                </child>
--- a/src/components/user_page.ui
+++ b/src/components/user_page.ui
@ -56,7 +56,7 @@
                                  </lookup>
                                </binding>
                                <style>
-                                  <class name="dim-label"/>
+                                  <class name="dimmed"/>
                                </style>
                              </object>
                            </child>
--- a/src/login/homeserver_page.ui
+++ b/src/login/homeserver_page.ui
@ -83,7 +83,7 @@
                              <object class="GtkLabel" id="homeserver_help">
                                <style>
                                  <class name="caption"/>
-                                  <class name="dim-label"/>
+                                  <class name="dimmed"/>
                                </style>
                                <property name="justify">left</property>
                                <property name="xalign">0.0</property>
--- a/src/session/view/account_settings/user_sessions_page/mod.ui
+++ b/src/session/view/account_settings/user_sessions_page/mod.ui
@ -71,7 +71,7 @@
                        <property name="wrap-mode">word-char</property>
                        <property name="label" translatable="yes">Could not load the list of connected devices</property>
                        <style>
-                          <class name="dim-label"/>
+                          <class name="dimmed"/>
                        </style>
                      </object>
                    </child>
--- a/src/session/view/content/explore/public_room_row.ui
+++ b/src/session/view/content/explore/public_room_row.ui
@ -49,7 +49,7 @@
                <property name="halign">start</property>
                <property name="xalign">0</property>
                <style>
-                  <class name="dim-label"/>
+                  <class name="dimmed"/>
                </style>
              </object>
            </child>
@ -72,14 +72,14 @@
                      <object class="GtkImage">
                        <property name="icon-name">users-symbolic</property>
                        <style>
-                          <class name="dim-label"/>
+                          <class name="dimmed"/>
                        </style>
                      </object>
                    </child>
                    <child>
                      <object class="GtkLabel" id="members_count">
                        <style>
-                          <class name="dim-label"/>
+                          <class name="dimmed"/>
                        </style>
                      </object>
                    </child>
--- a/src/session/view/content/invite.ui
+++ b/src/session/view/content/invite.ui
@ -78,7 +78,7 @@
                              </lookup>
                            </binding>
                            <style>
-                              <class name="dim-label"/>
+                              <class name="dimmed"/>
                            </style>
                          </object>
                        </child>
@ -96,7 +96,7 @@
                          </lookup>
                        </binding>
                        <style>
-                          <class name="dim-label"/>
+                          <class name="dimmed"/>
                        </style>
                      </object>
                    </child>
--- a/src/session/view/content/room_details/general_page.ui
+++ b/src/session/view/content/room_details/general_page.ui
@ -88,7 +88,7 @@
            <property name="xalign">0.0</property>
            <property name="label" translatable="yes">There are no members in this room</property>
            <style>
-              <class name="dim-label"/>
+              <class name="dimmed"/>
            </style>
          </object>
        </child>
@ -202,7 +202,7 @@
            <property name="xalign">0.0</property>
            <property name="label" translatable="yes">This room has no public addresses</property>
            <style>
-              <class name="dim-label"/>
+              <class name="dimmed"/>
            </style>
          </object>
        </child>
--- a/src/session/view/content/room_details/history_viewer/audio_row.ui
+++ b/src/session/view/content/room_details/history_viewer/audio_row.ui
@ -35,7 +35,7 @@
                <property name="ellipsize">end</property>
                <property name="xalign">0</property>
                <style>
-                  <class name="dim-label"/>
+                  <class name="dimmed"/>
                  <class name="numeric"/>
                </style>
              </object>
--- a/src/session/view/content/room_details/history_viewer/file_row.ui
+++ b/src/session/view/content/room_details/history_viewer/file_row.ui
@ -34,7 +34,7 @@
                <property name="ellipsize">end</property>
                <property name="xalign">0</property>
                <style>
-                  <class name="dim-label"/>
+                  <class name="dimmed"/>
                  <class name="numeric"/>
                </style>
              </object>
--- a/src/session/view/content/room_history/member_timestamp/row.ui
+++ b/src/session/view/content/room_history/member_timestamp/row.ui
@ -41,7 +41,7 @@
                <property name="hexpand">True</property>
                <property name="ellipsize">end</property>
                <style>
-                  <class name="dim-label"/>
+                  <class name="dimmed"/>
                  <class name="caption"/>
                </style>
              </object>
--- a/src/session/view/content/room_history/message_row/message_state_stack.ui
+++ b/src/session/view/content/room_history/message_row/message_state_stack.ui
@ -85,7 +85,7 @@
            <property name="child">
              <object class="GtkImage">
                <style>
-                  <class name="dim-label"/>
+                  <class name="dimmed"/>
                </style>
                <property name="icon-name">edit-symbolic</property>
                <!-- Translators: As in 'Edited message'. -->
--- a/src/session/view/content/room_history/message_row/mod.ui
+++ b/src/session/view/content/room_history/message_row/mod.ui
@ -39,7 +39,7 @@
                <style>
                  <class name="caption"/>
                  <class name="timestamp"/>
-                  <class name="dim-label"/>
+                  <class name="dimmed"/>
                </style>
              </object>
            </child>
--- a/src/session/view/content/room_history/message_toolbar/mod.ui
+++ b/src/session/view/content/room_history/message_toolbar/mod.ui
@ -54,7 +54,7 @@
                          <object class="ContentMessageContent" id="related_event_content">
                            <style>
                              <class name="related-event-content"/>
-                              <class name="dim-label"/>
+                              <class name="dimmed"/>
                            </style>
                            <property name="format">ellipsized</property>
                          </object>
--- a/src/session/view/content/room_history/read_receipts_list/mod.ui
+++ b/src/session/view/content/room_history/read_receipts_list/mod.ui
@ -14,7 +14,7 @@
            <property name="margin-start">2</property>
            <style>
              <class name="caption"/>
-              <class name="dim-label"/>
+              <class name="dimmed"/>
            </style>
          </object>
        </child>
--- a/src/session/view/content/room_history/state_row/mod.rs
+++ b/src/session/view/content/room_history/state_row/mod.rs
@ -398,7 +398,7 @@ enum WidgetType {
 /// Construct a `GtkLabel` for the given text.
 fn text(label: &str) -> gtk::Label {
    let child = gtk::Label::new(Some(label));
-    child.set_css_classes(&["event-content", "dim-label"]);
+    child.set_css_classes(&["event-content", "dimmed"]);
    child.set_wrap(true);
    child.set_wrap_mode(gtk::pango::WrapMode::WordChar);
    child.set_xalign(0.0);
--- a/src/session/view/content/room_history/typing_row.ui
+++ b/src/session/view/content/room_history/typing_row.ui
@ -24,7 +24,7 @@
                <property name="use-markup">True</property>
                <property name="ellipsize">end</property>
                <style>
-                  <class name="dim-label" />
+                  <class name="dimmed" />
                </style>
              </object>
            </child>
--- a/src/session/view/sidebar/room_row.rs
+++ b/src/session/view/sidebar/room_row.rs
@ -95,7 +95,7 @@ mod imp {
            }

            self.room.disconnect_signals();
-            self.display_name.remove_css_class("dim-label");
+            self.display_name.remove_css_class("dimmed");

            if let Some(room) = room {
                let highlight_handler = room.connect_highlight_notify(clone!(
@ -128,7 +128,7 @@ mod imp {
                ));

                if room.category() == RoomCategory::Left {
-                    self.display_name.add_css_class("dim-label");
+                    self.display_name.add_css_class("dimmed");
                }

                self.room.set(
@ -232,7 +232,7 @@ mod imp {
                    let icon = gtk::Image::builder()
                        .icon_name("person-symbolic")
                        .icon_size(gtk::IconSize::Normal)
-                        .css_classes(["dim-label"])
+                        .css_classes(["dimmed"])
                        .build();

                    self.display_name_box.prepend(&icon);
--- a/src/session/view/sidebar/section_row.ui
+++ b/src/session/view/sidebar/section_row.ui
@ -12,7 +12,7 @@
            <property name="ellipsize">end</property>
            <property name="label" bind-source="SidebarSectionRow" bind-property="label" bind-flags="sync-create"/>
            <style>
-              <class name="dim-label"/>
+              <class name="dimmed"/>
            </style>
          </object>
        </child>
@ -22,7 +22,7 @@
            <property name="accessible-role">presentation</property>
            <style>
              <class name="arrow"/>
-              <class name="dim-label"/>
+              <class name="dimmed"/>
            </style>
          </object>
        </child>