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

main-window: replace GtkApplicationWindow with HdyApplicaitonWindow

Browse source 
HdyApplicationWindow moves the titlebar into the content area of the
window which allows us to split the current main-titlebar and move the
parts directly into the leaflets without the need of swipe groups nor
size groups.
This commit is contained in:
Julian Sparber 2020-10-08 16:59:43 +02:00
parent 77897cbe18
commit dc6fb34422
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/client/application/application-main-window.vala
View file

@ -8,7 +8,7 @@
[GtkTemplate (ui = "/org/gnome/Geary/application-main-window.ui")] [GtkTemplate (ui = "/org/gnome/Geary/application-main-window.ui")]
public class Application.MainWindow : public class Application.MainWindow :
Gtk.ApplicationWindow, Geary.BaseInterface { Hdy.ApplicationWindow, Geary.BaseInterface {
// Named actions. // Named actions.
@ -1322,10 +1322,7 @@ public class Application.MainWindow :
this.main_toolbar.show_close_button = false; this.main_toolbar.show_close_button = false;
this.main_layout.pack_start(main_toolbar, false, true, 0); this.main_layout.pack_start(main_toolbar, false, true, 0);
} else { } else {
var titlebar = new Hdy.TitleBar(); this.main_layout.pack_start(main_toolbar, false, true, 0);
titlebar.show();
titlebar.add(this.main_toolbar);
set_titlebar(titlebar);
} }
this.main_toolbar.add_conversation_actions(this.conversation_actions); this.main_toolbar.add_conversation_actions(this.conversation_actions);

5
ui/application-main-window.ui
View file

@ -2,7 +2,7 @@
<!-- Generated with glade 3.22.2 --> <!-- Generated with glade 3.22.2 -->
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<template class="ApplicationMainWindow" parent="GtkApplicationWindow"> <template class="ApplicationMainWindow" parent="HdyApplicationWindow">
<property name="events">GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property> <property name="events">GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property>
<property name="show_menubar">False</property> <property name="show_menubar">False</property>
<signal name="delete-event" handler="on_delete_event" swapped="no"/> <signal name="delete-event" handler="on_delete_event" swapped="no"/>
@ -10,9 +10,6 @@
<signal name="focus-out-event" handler="on_focus_event" swapped="no"/> <signal name="focus-out-event" handler="on_focus_event" swapped="no"/>
<signal name="map" handler="on_map" swapped="no"/> <signal name="map" handler="on_map" swapped="no"/>
<signal name="unmap" handler="on_unmap" swapped="no"/> <signal name="unmap" handler="on_unmap" swapped="no"/>
<child type="titlebar">
<placeholder/>
</child>
<child> <child>
<object class="GtkOverlay" id="overlay"> <object class="GtkOverlay" id="overlay">
<property name="visible">True</property> <property name="visible">True</property>