Skip to content
Snippets Groups Projects
Commit f754094b authored by Michael Gratton's avatar Michael Gratton
Browse files

Merge branch 'composer-hdy-headerbar' into 'mainline'

composer-headerbar: Use HdyHeaderBar

See merge request GNOME/geary!664
parents 2e56aeda 40dd92e8
No related branches found
No related tags found
1 merge request!14Update to git snapshot
......@@ -59,9 +59,9 @@ public class MainToolbar : Hdy.Leaflet {
BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
}
public void set_conversation_header(Gtk.HeaderBar header) {
public void set_conversation_header(Hdy.HeaderBar header) {
remove(conversation_header);
this.header_group.add_gtk_header_bar(header);
this.header_group.add_header_bar(header);
header.hexpand = true;
conversation_group.remove_widget(conversation_header);
conversation_group.add_widget(header);
......@@ -69,9 +69,9 @@ public class MainToolbar : Hdy.Leaflet {
child_set(header, "name", "conversation", null);
}
public void remove_conversation_header(Gtk.HeaderBar header) {
public void remove_conversation_header(Hdy.HeaderBar 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.add_widget(conversation_header);
add(conversation_header);
......
......@@ -5,7 +5,7 @@
*/
[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 {
......
......@@ -2,7 +2,7 @@
<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.20"/>
<template class="ComposerHeaderbar" parent="GtkHeaderBar">
<template class="ComposerHeaderbar" parent="HdyHeaderBar">
<property name="visible">True</property>
<child type="title">
<object class="GtkBox">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment