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

Composer.Widget: Place composer action bars into their own container

Browse source 
Use CSS instead of widget props to ensure widgets have sufficient
white space.

This will allow adding additional action bars (e.g. by plugins) in a
more straight-forward manner.
This commit is contained in:
Michael Gratton 2020-07-07 16:25:05 +10:00 • committed by Michael James Gratton
parent 7230ea4e69
commit bde39bf985
3 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/client/composer/composer-widget.vala
View file

@ -419,6 +419,8 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
[GtkChild]
private Gtk.Label message_overlay_label;
[GtkChild]
private Gtk.Box action_bar_box;
[GtkChild]
private Gtk.Box attachments_box;
[GtkChild]
private Gtk.Box hidden_on_attachment_drag_over;
@ -1953,8 +1955,6 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
wrapper_box.pack_start(new Gtk.Separator(HORIZONTAL));
Gtk.Box box = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 6);
box.margin_top = 6;
box.margin_bottom = 6;
wrapper_box.pack_start(box);
/// In the composer, the filename followed by its filesize, i.e. "notes.txt (1.12KB)"
@ -1963,8 +1963,6 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
Gtk.Label label = new Gtk.Label(label_text);
box.pack_start(label);
label.halign = Gtk.Align.START;
label.margin_start = 4;
label.margin_end = 4;
Gtk.Button remove_button = new Gtk.Button.from_icon_name("user-trash-symbolic", BUTTON);
box.pack_start(remove_button, false, false);

25
ui/composer-widget.ui
View file

@ -575,6 +575,18 @@
</style>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="action_bar_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkRevealer" id="formatting">
<property name="visible">True</property>
@ -1219,28 +1231,25 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkBox" id="attachments_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_right">6</property>
<property name="margin_start">6</property>
<property name="margin_end">6</property>
<property name="margin_top">0</property>
<property name="margin_bottom">3</property>
<property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
<style>
<class name="geary-attachments-box"/>
</style>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">4</property>
<property name="position">5</property>
</packing>
</child>
</object>

8
ui/geary.css
View file

@ -191,6 +191,14 @@ grid.geary-message-summary {
border-radius: 0px;
}
.geary-attachments-box > box > box {
margin: 6px;
}
.geary-attachments-box > box > box > label {
margin: 0px 4px;
}
/* AttachmentPane */
.geary-attachment-pane flowbox {