diff options
author | fiaxh <git@lightrise.org> | 2024-06-20 18:39:25 +0200 |
---|---|---|
committer | fiaxh <git@lightrise.org> | 2024-06-20 18:57:24 +0200 |
commit | 984ae3f5b89081f97696cd5051167a18159aa60b (patch) | |
tree | b0dfeec49492b7abee0aa3d016e61185eae1054b /main/src | |
parent | 680f0dd0a768b201b62899905c38210e834dde91 (diff) | |
download | dino-984ae3f5b89081f97696cd5051167a18159aa60b.tar.gz dino-984ae3f5b89081f97696cd5051167a18159aa60b.zip |
Settings dialog: Fix account subpage for Adwaita < 1.4, other fixes
fixes #1592
Diffstat (limited to 'main/src')
-rw-r--r-- | main/src/ui/main_window_controller.vala | 2 | ||||
-rw-r--r-- | main/src/windows/preferences_window/account_preferences_subpage.vala | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/main/src/ui/main_window_controller.vala b/main/src/ui/main_window_controller.vala index 7a3ebcb2..2e270663 100644 --- a/main/src/ui/main_window_controller.vala +++ b/main/src/ui/main_window_controller.vala @@ -69,7 +69,7 @@ public class MainWindowController : Object { dialog.set_transient_for(app.get_active_window()); dialog.present(); }); - window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("accounts", null); }); + window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("preferences", null); }); window.conversation_selector.conversation_selected.connect((conversation) => select_conversation(conversation)); // ConversationListModel list_model = new ConversationListModel(stream_interactor); diff --git a/main/src/windows/preferences_window/account_preferences_subpage.vala b/main/src/windows/preferences_window/account_preferences_subpage.vala index 462fc8e1..01cf5584 100644 --- a/main/src/windows/preferences_window/account_preferences_subpage.vala +++ b/main/src/windows/preferences_window/account_preferences_subpage.vala @@ -8,6 +8,7 @@ using Gdk; [GtkTemplate (ui = "/im/dino/Dino/preferences_window_account.ui")] public class Dino.Ui.AccountPreferencesSubpage : Gtk.Box { + [GtkChild] public unowned Adw.HeaderBar headerbar; [GtkChild] public unowned Button back_button; [GtkChild] public unowned AvatarPicture avatar; [GtkChild] public unowned Adw.ActionRow xmpp_address; @@ -30,6 +31,9 @@ public class Dino.Ui.AccountPreferencesSubpage : Gtk.Box { private ulong alias_entry_changed = 0; construct { +#if Adw_1_4 + headerbar.show_title = false; +#endif button_container.layout_manager = new NaturalDirectionBoxLayout((BoxLayout)button_container.layout_manager); back_button.clicked.connect(() => { var window = (Adw.PreferencesWindow) this.get_root(); |