From 01698959feaa9005c8a5f3439478431ab5837792 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 21 Feb 2020 02:42:19 +0100 Subject: Move ConversationTitlebar into ConversationViewController responsibility --- main/src/ui/conversation_list_titlebar.vala | 35 +++++++++++++++++++---------- 1 file changed, 23 insertions(+), 12 deletions(-) (limited to 'main/src/ui/conversation_list_titlebar.vala') diff --git a/main/src/ui/conversation_list_titlebar.vala b/main/src/ui/conversation_list_titlebar.vala index ee9ff6bf..901902db 100644 --- a/main/src/ui/conversation_list_titlebar.vala +++ b/main/src/ui/conversation_list_titlebar.vala @@ -10,22 +10,33 @@ public class ConversationListTitlebar : Gtk.Box { [GtkChild] private MenuButton add_button; [GtkChild] private MenuButton menu_button; - private StreamInteractor stream_interactor; - - public ConversationListTitlebar(StreamInteractor stream_interactor, Window window) { - this.stream_interactor = stream_interactor; - create_add_menu(window); + public ConversationListTitlebar() { + create_add_menu(add_button, menu_button); } +} + +[GtkTemplate (ui = "/im/dino/Dino/conversation_list_titlebar_csd.ui")] +public class ConversationListTitlebarCsd : Gtk.HeaderBar { - private void create_add_menu(Window window) { - Builder add_builder = new Builder.from_resource("/im/dino/Dino/menu_add.ui"); - MenuModel add_menu_model = add_builder.get_object("menu_add") as MenuModel; - add_button.set_menu_model(add_menu_model); + [GtkChild] private MenuButton add_button; + [GtkChild] private MenuButton menu_button; - Builder menu_builder = new Builder.from_resource("/im/dino/Dino/menu_app.ui"); - MenuModel menu_menu_model = menu_builder.get_object("menu_app") as MenuModel; - menu_button.set_menu_model(menu_menu_model); + public ConversationListTitlebarCsd() { + custom_title = new Label("Dino") { visible = true, hexpand = true, xalign = 0 }; + custom_title.get_style_context().add_class("title"); + + create_add_menu(add_button, menu_button); } } +private static void create_add_menu(MenuButton add_button, MenuButton menu_button) { + Builder add_builder = new Builder.from_resource("/im/dino/Dino/menu_add.ui"); + MenuModel add_menu_model = add_builder.get_object("menu_add") as MenuModel; + add_button.set_menu_model(add_menu_model); + + Builder menu_builder = new Builder.from_resource("/im/dino/Dino/menu_app.ui"); + MenuModel menu_menu_model = menu_builder.get_object("menu_app") as MenuModel; + menu_button.set_menu_model(menu_menu_model); +} + } -- cgit v1.2.3-70-g09d2