nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

composer-headerbar: Use HdyHeaderBar

Browse source 
This allows the headerbar to be draggable with HdyApplicationWindow.
This commit is contained in:
James Westman 2021-02-11 01:14:04 -06:00
parent 2e56aeda90
commit 40dd92e8c3
No known key found for this signature in database
GPG key ID: CE2DBA0ADB654EA6
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client/components/main-toolbar.vala
View file

@ -59,9 +59,9 @@ public class MainToolbar : Hdy.Leaflet {
BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL); BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
} }
public void set_conversation_header(Gtk.HeaderBar header) { public void set_conversation_header(Hdy.HeaderBar header) {
remove(conversation_header); remove(conversation_header);
this.header_group.add_gtk_header_bar(header); this.header_group.add_header_bar(header);
header.hexpand = true; header.hexpand = true;
conversation_group.remove_widget(conversation_header); conversation_group.remove_widget(conversation_header);
conversation_group.add_widget(header); conversation_group.add_widget(header);
@ -69,9 +69,9 @@ public class MainToolbar : Hdy.Leaflet {
child_set(header, "name", "conversation", null); child_set(header, "name", "conversation", null);
} }
public void remove_conversation_header(Gtk.HeaderBar header) { public void remove_conversation_header(Hdy.HeaderBar header) {
remove(header); remove(header);
this.header_group.remove_gtk_header_bar(header); this.header_group.remove_header_bar(header);
conversation_group.remove_widget(header); conversation_group.remove_widget(header);
conversation_group.add_widget(conversation_header); conversation_group.add_widget(conversation_header);
add(conversation_header); add(conversation_header);

2
src/client/composer/composer-headerbar.vala
View file

@ -5,7 +5,7 @@
*/ */
[GtkTemplate (ui = "/org/gnome/Geary/composer-headerbar.ui")] [GtkTemplate (ui = "/org/gnome/Geary/composer-headerbar.ui")]
public class Composer.Headerbar : Gtk.HeaderBar { public class Composer.Headerbar : Hdy.HeaderBar {
public bool show_save_and_close { public bool show_save_and_close {

2
ui/composer-headerbar.ui
View file

@ -2,7 +2,7 @@
<!-- Generated with glade 3.22.1 --> <!-- Generated with glade 3.22.1 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<template class="ComposerHeaderbar" parent="GtkHeaderBar"> <template class="ComposerHeaderbar" parent="HdyHeaderBar">
<property name="visible">True</property> <property name="visible">True</property>
<child type="title"> <child type="title">
<object class="GtkBox"> <object class="GtkBox">