gjdwebserver-overlay/mail-client/geary/files/0058-composer-Switch-leaflet-to-composer-when-folded.patch

73 lines
2.8 KiB
Diff
Raw Normal View History

2021-03-01 15:30:25 +01:00
From 1f2896e9a7ba02c0a909c91bb551e596d2d72230 Mon Sep 17 00:00:00 2001
From: Julian Sparber <julian@sparber.net>
Date: Thu, 1 Oct 2020 10:40:41 +0200
Subject: [PATCH 058/124] composer: Switch leaflet to composer when folded
---
src/client/application/application-main-window.vala | 2 ++
src/client/components/main-toolbar.vala | 13 +++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 97960660..c2b0954b 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -916,6 +916,8 @@ public class Application.MainWindow :
} else {
this.conversation_viewer.do_compose(composer);
}
+ // Show the correct leaflet
+ this.main_leaflet.set_visible_child_name("conversation");
}
}
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index c7bdab8f..0ecb599a 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -64,6 +64,8 @@ public class MainToolbar : Hdy.Leaflet {
[GtkChild]
private Hdy.HeaderGroup header_group;
+ Gtk.SizeGroup conversation_group;
+
private bool show_trash_button = true;
// Load these at construction time
@@ -98,16 +100,22 @@ public class MainToolbar : Hdy.Leaflet {
}
public void set_conversation_header(Gtk.HeaderBar header) {
- conversation_header.hide();
+ remove(conversation_header);
this.header_group.add_gtk_header_bar(header);
header.hexpand = true;
+ conversation_group.remove_widget(conversation_header);
+ conversation_group.add_widget(header);
add(header);
+ child_set(header, "name", "conversation", null);
}
public void remove_conversation_header(Gtk.HeaderBar header) {
remove(header);
this.header_group.remove_gtk_header_bar(header);
- conversation_header.show();
+ conversation_group.remove_widget(header);
+ conversation_group.add_widget(conversation_header);
+ add(conversation_header);
+ child_set(conversation_header, "name", "conversation", null);
}
public void update_trash_button(bool show_trash) {
@@ -125,6 +133,7 @@ public class MainToolbar : Hdy.Leaflet {
conversations_group.add_widget(conversations_header);
conversations_separator_group.add_widget(conversations_separator);
conversation_group.add_widget(conversation_header);
+ this.conversation_group = conversation_group;
}
public void add_to_swipe_groups(Hdy.SwipeGroup conversations_group,
--
2.29.2