From 7edf7303cbd1b6c4dcea7c87573eb9c99a2d5988 Mon Sep 17 00:00:00 2001 From: mimi89999 Date: Sun, 17 Jan 2021 19:50:32 +0100 Subject: Add separators and back button to non csd header --- main/src/ui/main_window.vala | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'main/src/ui/main_window.vala') diff --git a/main/src/ui/main_window.vala b/main/src/ui/main_window.vala index 1f78bcc1..14563c28 100644 --- a/main/src/ui/main_window.vala +++ b/main/src/ui/main_window.vala @@ -50,6 +50,12 @@ public class MainWindow : Gtk.Window { setup_headerbar(); setup_stack(); + if (!Util.use_csd()) { + box.add(headerbar_paned); + box.add(new Separator(Orientation.VERTICAL) { visible = true }); + } + box.add(paned); + paned.bind_property("transition-type", headerbar_paned, "transition-type", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL); paned.bind_property("mode-transition-duration", headerbar_paned, "mode-transition-duration", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL); paned.bind_property("child-transition-duration", headerbar_paned, "child-transition-duration", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL); @@ -62,7 +68,6 @@ public class MainWindow : Gtk.Window { Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui"); paned = (Hdy.Leaflet) builder.get_object("paned"); paned.notify["folded"].connect_after(() => update_headerbar()); - box.add(paned); left_stack = (Stack) builder.get_object("left_stack"); right_stack = (Stack) builder.get_object("right_stack"); conversation_view = (ConversationView) builder.get_object("conversation_view"); @@ -76,8 +81,7 @@ public class MainWindow : Gtk.Window { } private void update_headerbar() { - if (!Util.use_csd()) return; - conversation_titlebar_csd.back_button = paned.folded; + conversation_titlebar.back_button = paned.folded; } private void show_list_pane() { @@ -119,11 +123,14 @@ public class MainWindow : Gtk.Window { headerbar_paned.add_with_properties(conversation_list_titlebar, "name", "list-pane"); conversation_list_group.add_widget(conversation_list_titlebar); + Separator sep = new Separator(Orientation.HORIZONTAL) { visible = true }; + sep.get_style_context().add_class("sidebar"); + headerbar_paned.add(sep); + conversation_titlebar = new ConversationTitlebarNoCsd() { visible=true }; + conversation_titlebar.back_pressed.connect(() => show_list_pane()); headerbar_paned.add_with_properties(conversation_titlebar, "name", "view-pane"); conversation_view_group.add_widget(conversation_titlebar); - - box.add(headerbar_paned); } } -- cgit v1.2.3