diff --git a/Cargo.toml b/Cargo.toml index bd5afa86..789c7958 100644 --- 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" } diff --git a/data/resources/stylesheet/_session_view.scss b/data/resources/stylesheet/_session_view.scss index a24e2a3b..36782c9a 100644 --- 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; } } diff --git a/meson.build b/meson.build index 877c1d49..f9f6deaf 100644 --- 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') diff --git a/src/account_chooser_dialog/account_row.ui b/src/account_chooser_dialog/account_row.ui index bc367747..151c6cb5 100644 --- a/src/account_chooser_dialog/account_row.ui +++ b/src/account_chooser_dialog/account_row.ui @@ -25,7 +25,7 @@ 0.0 True diff --git a/src/account_switcher/session_item.ui b/src/account_switcher/session_item.ui index 24a2b4c4..5f6106cc 100644 --- a/src/account_switcher/session_item.ui +++ b/src/account_switcher/session_item.ui @@ -30,7 +30,7 @@ True end diff --git a/src/components/dialogs/join_room.ui b/src/components/dialogs/join_room.ui index 18caa56f..6101c28e 100644 --- a/src/components/dialogs/join_room.ui +++ b/src/components/dialogs/join_room.ui @@ -150,7 +150,7 @@ word-char center @@ -172,14 +172,14 @@ users-symbolic presentation diff --git a/src/components/pill/source_row.ui b/src/components/pill/source_row.ui index 1b707bc4..3c3e1a80 100644 --- a/src/components/pill/source_row.ui +++ b/src/components/pill/source_row.ui @@ -42,7 +42,7 @@ diff --git a/src/components/rows/substring_entry_row.ui b/src/components/rows/substring_entry_row.ui index cc0745b3..f82e9d3f 100644 --- a/src/components/rows/substring_entry_row.ui +++ b/src/components/rows/substring_entry_row.ui @@ -39,7 +39,7 @@ # @@ -75,7 +75,7 @@ :matrix.org diff --git a/src/components/user_page.ui b/src/components/user_page.ui index 42e26f4a..78625c14 100644 --- a/src/components/user_page.ui +++ b/src/components/user_page.ui @@ -56,7 +56,7 @@ diff --git a/src/login/homeserver_page.ui b/src/login/homeserver_page.ui index 6367939d..58e5dbb0 100644 --- a/src/login/homeserver_page.ui +++ b/src/login/homeserver_page.ui @@ -83,7 +83,7 @@ left 0.0 diff --git a/src/session/view/account_settings/user_sessions_page/mod.ui b/src/session/view/account_settings/user_sessions_page/mod.ui index 484011d5..8be20a86 100644 --- 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 @@ word-char Could not load the list of connected devices diff --git a/src/session/view/content/explore/public_room_row.ui b/src/session/view/content/explore/public_room_row.ui index 8ee2f5f3..2f8b413c 100644 --- a/src/session/view/content/explore/public_room_row.ui +++ b/src/session/view/content/explore/public_room_row.ui @@ -49,7 +49,7 @@ start 0 @@ -72,14 +72,14 @@ users-symbolic diff --git a/src/session/view/content/invite.ui b/src/session/view/content/invite.ui index d758737a..3f8ee4d5 100644 --- a/src/session/view/content/invite.ui +++ b/src/session/view/content/invite.ui @@ -78,7 +78,7 @@ @@ -96,7 +96,7 @@ diff --git a/src/session/view/content/room_details/general_page.ui b/src/session/view/content/room_details/general_page.ui index 01e79743..785a3454 100644 --- a/src/session/view/content/room_details/general_page.ui +++ b/src/session/view/content/room_details/general_page.ui @@ -88,7 +88,7 @@ 0.0 There are no members in this room @@ -202,7 +202,7 @@ 0.0 This room has no public addresses diff --git a/src/session/view/content/room_details/history_viewer/audio_row.ui b/src/session/view/content/room_details/history_viewer/audio_row.ui index 803ef1a7..a0b0d788 100644 --- 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 @@ end 0 diff --git a/src/session/view/content/room_details/history_viewer/file_row.ui b/src/session/view/content/room_details/history_viewer/file_row.ui index dd1960f6..c9fc5ae1 100644 --- 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 @@ end 0 diff --git a/src/session/view/content/room_history/member_timestamp/row.ui b/src/session/view/content/room_history/member_timestamp/row.ui index 7530a48f..1dafc587 100644 --- 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 @@ True end diff --git 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 index e5527a0d..1db9a8cf 100644 --- 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 @@ edit-symbolic diff --git a/src/session/view/content/room_history/message_row/mod.ui b/src/session/view/content/room_history/message_row/mod.ui index 2eca44bc..c5e6b006 100644 --- 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 @@ diff --git a/src/session/view/content/room_history/message_toolbar/mod.ui b/src/session/view/content/room_history/message_toolbar/mod.ui index 7c8605a3..bc84ca71 100644 --- 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 @@ ellipsized diff --git a/src/session/view/content/room_history/read_receipts_list/mod.ui b/src/session/view/content/room_history/read_receipts_list/mod.ui index 6f532a35..616d366a 100644 --- 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 @@ 2 diff --git a/src/session/view/content/room_history/state_row/mod.rs b/src/session/view/content/room_history/state_row/mod.rs index 0d4f5d22..c96f45a8 100644 --- 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); diff --git a/src/session/view/content/room_history/typing_row.ui b/src/session/view/content/room_history/typing_row.ui index f4df1cbd..58509428 100644 --- a/src/session/view/content/room_history/typing_row.ui +++ b/src/session/view/content/room_history/typing_row.ui @@ -24,7 +24,7 @@ True end diff --git a/src/session/view/sidebar/room_row.rs b/src/session/view/sidebar/room_row.rs index a54a7004..d1553e08 100644 --- 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); diff --git a/src/session/view/sidebar/section_row.ui b/src/session/view/sidebar/section_row.ui index 7b3de8a8..ed6743c0 100644 --- a/src/session/view/sidebar/section_row.ui +++ b/src/session/view/sidebar/section_row.ui @@ -12,7 +12,7 @@ end @@ -22,7 +22,7 @@ presentation