TakeV/dino
1
0
Fork 0
mirror of https://github.com/TakeV-Lambda/dino.git synced 2024-11-21 22:44:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change Gtk.Paned to Adw.Leaflet in MainWindow

Browse source
This commit is contained in:
Teemu Ikonen 2022-09-12 17:43:30 +03:00 committed by Marvin W
parent e934a76a11
commit 0d7c8bb6e1
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
main/data/unified_main_content.ui
View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<interface> <interface>
<requires lib="gtk" version="4.0"/> <requires lib="gtk" version="4.0"/>
<object class="GtkPaned" id="paned"> <object class="AdwLeaflet" id="leaflet">
<property name="shrink-start-child">False</property> <property name="transition-type">slide</property>
<property name="shrink-end-child">False</property> <property name="can-navigate-back">true</property>
<property name="resize-start-child">False</property> <property name="can-navigate-forward">true</property>
<property name="position">300</property>
<child> <child>
<object class="GtkBox" id="left_box"> <object class="GtkBox" id="left_box">
<property name="orientation">vertical</property> <property name="orientation">vertical</property>

13
main/src/ui/main_window.vala
View file

@ -20,7 +20,7 @@ public class MainWindow : Adw.Window {
public ConversationTitlebar conversation_titlebar; public ConversationTitlebar conversation_titlebar;
public Widget conversation_list_titlebar; public Widget conversation_list_titlebar;
public Box box = new Box(Orientation.VERTICAL, 0) { orientation=Orientation.VERTICAL }; public Box box = new Box(Orientation.VERTICAL, 0) { orientation=Orientation.VERTICAL };
public Paned paned; public Adw.Leaflet leaflet;
public Box left_box; public Box left_box;
public Box right_box; public Box right_box;
public Revealer search_revealer; public Revealer search_revealer;
@ -60,8 +60,8 @@ public class MainWindow : Adw.Window {
private void setup_unified() { private void setup_unified() {
Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui"); Builder builder = new Builder.from_resource("/im/dino/Dino/unified_main_content.ui");
paned = (Paned) builder.get_object("paned"); leaflet = (Adw.Leaflet) builder.get_object("leaflet");
box.append(paned); box.append(leaflet);
left_box = (Box) builder.get_object("left_box"); left_box = (Box) builder.get_object("left_box");
right_box = (Box) builder.get_object("right_box"); right_box = (Box) builder.get_object("right_box");
left_stack = (Stack) builder.get_object("left_stack"); left_stack = (Stack) builder.get_object("left_stack");
@ -69,6 +69,7 @@ public class MainWindow : Adw.Window {
conversation_view = (ConversationView) builder.get_object("conversation_view"); conversation_view = (ConversationView) builder.get_object("conversation_view");
search_revealer = (Revealer) builder.get_object("search_revealer"); search_revealer = (Revealer) builder.get_object("search_revealer");
conversation_selector = ((ConversationSelector) builder.get_object("conversation_list")).init(stream_interactor); conversation_selector = ((ConversationSelector) builder.get_object("conversation_list")).init(stream_interactor);
conversation_selector.conversation_selected.connect_after(() => leaflet.navigate(Adw.NavigationDirection.FORWARD));
Frame search_frame = (Frame) builder.get_object("search_frame"); Frame search_frame = (Frame) builder.get_object("search_frame");
global_search = new GlobalSearch(stream_interactor); global_search = new GlobalSearch(stream_interactor);
@ -82,8 +83,8 @@ public class MainWindow : Adw.Window {
if (Util.use_csd()) { if (Util.use_csd()) {
conversation_list_titlebar = get_conversation_list_titlebar_csd(); conversation_list_titlebar = get_conversation_list_titlebar_csd();
conversation_titlebar = new ConversationTitlebarCsd(); conversation_titlebar = new ConversationTitlebarCsd();
paned.bind_property("folded", conversation_list_titlebar, "show-end-title-buttons", BindingFlags.SYNC_CREATE); leaflet.bind_property("folded", conversation_list_titlebar, "show-end-title-buttons", BindingFlags.SYNC_CREATE);
paned.bind_property("folded", conversation_titlebar.get_widget(), "show-start-title-buttons", BindingFlags.SYNC_CREATE); leaflet.bind_property("folded", conversation_titlebar.get_widget(), "show-start-title-buttons", BindingFlags.SYNC_CREATE);
} else { } else {
Label title_label = new Label("Dino"); Label title_label = new Label("Dino");
HeaderBar titlebar = new HeaderBar() { title_widget=title_label, show_title_buttons=true }; HeaderBar titlebar = new HeaderBar() { title_widget=title_label, show_title_buttons=true };
@ -94,6 +95,8 @@ public class MainWindow : Adw.Window {
} }
left_box.prepend(conversation_list_titlebar); left_box.prepend(conversation_list_titlebar);
right_box.prepend(conversation_titlebar.get_widget()); right_box.prepend(conversation_titlebar.get_widget());
leaflet.notify["folded"].connect_after(() => conversation_titlebar.back_button_visible = leaflet.folded);
conversation_titlebar.back_pressed.connect(() => leaflet.navigate(Adw.NavigationDirection.BACK));
} }
private void setup_stack() { private void setup_stack() {