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

client: Fix packing of Component.ConversationActions

Browse source
This commit is contained in:
Michael Gratton 2021-04-10 21:23:59 +10:00 • committed by Michael James Gratton
parent 9e641600c3
commit 4eefe3013e
4 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client/components/components-conversation-actions.vala
View file

@ -16,6 +16,8 @@ public class Components.ConversationActions : Gtk.Box {
public bool show_response_actions { get; construct; } public bool show_response_actions { get; construct; }
public bool pack_justified { get; construct; }
public FolderPopover copy_folder_menu { get; private set; default = new FolderPopover(); } public FolderPopover copy_folder_menu { get; private set; default = new FolderPopover(); }
public FolderPopover move_folder_menu { get; private set; default = new FolderPopover(); } public FolderPopover move_folder_menu { get; private set; default = new FolderPopover(); }
@ -45,7 +47,6 @@ public class Components.ConversationActions : Gtk.Box {
// GObject style constuction to support loading via GTK Builder files // GObject style constuction to support loading via GTK Builder files
construct { construct {
// Assemble the mark menus // Assemble the mark menus
Gtk.Builder menu_builder = new Gtk.Builder.from_resource( Gtk.Builder menu_builder = new Gtk.Builder.from_resource(
"/org/gnome/Geary/components-main-toolbar-menus.ui" "/org/gnome/Geary/components-main-toolbar-menus.ui"
@ -62,6 +63,11 @@ public class Components.ConversationActions : Gtk.Box {
this.response_buttons.set_visible(this.show_response_actions); this.response_buttons.set_visible(this.show_response_actions);
this.mark_copy_move_buttons.set_visible(this.show_conversation_actions); this.mark_copy_move_buttons.set_visible(this.show_conversation_actions);
this.archive_trash_delete_buttons.set_visible(this.show_conversation_actions); this.archive_trash_delete_buttons.set_visible(this.show_conversation_actions);
if (this.pack_justified) {
this.archive_trash_delete_buttons.hexpand = true;
this.archive_trash_delete_buttons.halign = END;
}
} }
public void update_trash_button(bool show_trash) { public void update_trash_button(bool show_trash) {

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

@ -108,6 +108,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="show_conversation_actions">True</property> <property name="show_conversation_actions">True</property>
<property name="show_response_actions">False</property> <property name="show_response_actions">False</property>
<property name="pack_justified">True</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
</object> </object>
</child> </child>
@ -155,7 +156,6 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="show_conversation_actions">False</property> <property name="show_conversation_actions">False</property>
<property name="show_response_actions">True</property> <property name="show_response_actions">True</property>
<property name="hexpand">True</property>
</object> </object>
</child> </child>
</object> </object>

30
ui/components-conversation-actions.ui
View file

@ -3,6 +3,7 @@
<interface> <interface>
<requires lib="gtk+" version="3.20"/> <requires lib="gtk+" version="3.20"/>
<template class="ComponentsConversationActions" parent="GtkBox"> <template class="ComponentsConversationActions" parent="GtkBox">
<property name="orientation">horizontal</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child> <child>
@ -25,7 +26,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
@ -46,7 +47,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
@ -67,7 +68,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
@ -76,11 +77,6 @@
<class name="linked"/> <class name="linked"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkBox" id="mark_copy_move_buttons"> <object class="GtkBox" id="mark_copy_move_buttons">
@ -100,7 +96,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
@ -119,7 +115,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
@ -138,7 +134,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
@ -147,11 +143,6 @@
<class name="linked"/> <class name="linked"/>
</style> </style>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child> </child>
<child> <child>
<object class="GtkImage" id="archive_image"> <object class="GtkImage" id="archive_image">
@ -173,7 +164,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
@ -193,7 +184,7 @@
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">False</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
@ -204,9 +195,6 @@
</object> </object>
<packing> <packing>
<property name="pack_type">end</property> <property name="pack_type">end</property>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</template> </template>

5
ui/components-main-toolbar.ui
View file

@ -167,9 +167,10 @@
</child> </child>
</object> </object>
</child> </child>
<child> <child type="title">
<object class="HdySqueezer"> <object class="HdySqueezer" id="actions_squeezer">
<property name="visible">True</property> <property name="visible">True</property>
<property name="hexpand">True</property>
<child> <child>
<object class="ComponentsConversationActions" id="full_actions"> <object class="ComponentsConversationActions" id="full_actions">
<property name="visible">True</property> <property name="visible">True</property>