printers: Add whitespace between top right buttons
Fixes #895 Fixes #685
This commit is contained in:
parent
999962fbfc
commit
57eae62c6e
2 changed files with 26 additions and 23 deletions
|
@ -237,11 +237,7 @@ cc_printers_panel_constructed (GObject *object)
|
|||
shell = cc_panel_get_shell (CC_PANEL (self));
|
||||
|
||||
widget = (GtkWidget*)
|
||||
gtk_builder_get_object (self->builder, "printer-add-button");
|
||||
cc_shell_embed_widget_in_header (shell, widget, GTK_POS_RIGHT);
|
||||
|
||||
widget = (GtkWidget*)
|
||||
gtk_builder_get_object (self->builder, "search-button");
|
||||
gtk_builder_get_object (self->builder, "top-right-buttons");
|
||||
cc_shell_embed_widget_in_header (shell, widget, GTK_POS_RIGHT);
|
||||
|
||||
widget = (GtkWidget*)
|
||||
|
@ -1163,7 +1159,7 @@ cc_printers_panel_init (CcPrintersPanel *self)
|
|||
GtkWidget *widget;
|
||||
PpCups *cups;
|
||||
g_autoptr(GError) error = NULL;
|
||||
gchar *objects[] = { "overlay", "permission-infobar", "printer-add-button", "search-button", NULL };
|
||||
gchar *objects[] = { "overlay", "permission-infobar", "top-right-buttons", "printer-add-button", "search-button", NULL };
|
||||
guint builder_result;
|
||||
|
||||
g_resources_register (cc_printers_get_resource ());
|
||||
|
|
|
@ -1,6 +1,10 @@
|
|||
<?xml version="1.0"?>
|
||||
<interface>
|
||||
<requires lib="gtk+" version="3.12"/>
|
||||
<object class="GtkBox" id="top-right-buttons">
|
||||
<property name="visible">True</property>
|
||||
<property name="spacing">6</property>
|
||||
<child>
|
||||
<object class="GtkButton" id="printer-add-button">
|
||||
<property name="visible">True</property>
|
||||
<property name="sensitive">True</property>
|
||||
|
@ -10,7 +14,8 @@
|
|||
<class name="suggested-action"/>
|
||||
</style>
|
||||
</object>
|
||||
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkToggleButton" id="search-button">
|
||||
<property name="visible">True</property>
|
||||
<property name="margin-end">6</property> <!-- since we don't have access to the shell header bar -->
|
||||
|
@ -24,6 +29,8 @@
|
|||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
|
||||
<object class="GtkOverlay" id="overlay">
|
||||
<property name="visible">True</property>
|
||||
|
|
Loading…
Add table
Reference in a new issue