[gnome-control-center/wip/jsparber/background: 6/28] background: change margins for preview to 16px
- From: Julian Sparber <jsparber src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center/wip/jsparber/background: 6/28] background: change margins for preview to 16px
- Date: Sat, 17 Feb 2018 19:42:01 +0000 (UTC)
commit 2647a8258b13f703274f083615219896870cd1be
Author: Julian Sparber <julian sparber net>
Date: Wed Nov 8 22:52:31 2017 +0100
background: change margins for preview to 16px
https://bugzilla.gnome.org/show_bug.cgi?id=788515
panels/background/background.ui | 95 ++++++++++++++++-----------------
panels/background/cc-background-panel.c | 24 ++++-----
2 files changed, 58 insertions(+), 61 deletions(-)
---
diff --git a/panels/background/background.ui b/panels/background/background.ui
index 4b8d0adb3..29da67111 100644
--- a/panels/background/background.ui
+++ b/panels/background/background.ui
@@ -14,7 +14,7 @@
<property name="halign">fill</property>
<property name="orientation">vertical</property>
<property name="expand">True</property>
- <property name="height_request">100</property>
+ <property name="height_request">200</property>
<child>
<object class="GtkAspectFrame">
<property name="visible">True</property>
@@ -27,8 +27,6 @@
<object class="GtkBox" id="background-preview-top">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin">6</property>
- <property name="spacing">6</property>
<property name="orientation">vertical</property>
<style>
<class name="black-border"/>
@@ -50,67 +48,66 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="bottom-hbox">
+ <object class="GtkRevealer" id="wallpaper-info">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="reveal-child">True</property>
<child>
- <object class="GtkBox" id="hbox2">
+ <object class="GtkBox" id="slide-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">center</property>
- <property name="margin_top">12</property>
- <property name="spacing">2</property>
+ <property name="margin_top">10</property>
<child>
- <object class="GtkImage" id="slide_image">
+ <object class="GtkBox" id="hbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">slideshow-symbolic</property>
+ <property name="halign">center</property>
+ <child>
+ <object class="GtkImage" id="slide_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">slideshow-symbolic</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="strut">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="slide-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes" comments="This refers to a slideshow
background">Changes throughout the day</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="strut">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="slide-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes" comments="This refers to a slideshow
background">Changes throughout the day</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
@@ -120,7 +117,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="backgroud-gallery-box">
+ <object class="GtkBox" id="background-gallery-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="expand">True</property>
diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
index fc25f4b7a..e81942f45 100644
--- a/panels/background/cc-background-panel.c
+++ b/panels/background/cc-background-panel.c
@@ -146,8 +146,8 @@ update_preview (CcBackgroundPanel *panel,
changes_with_time = cc_background_item_changes_with_time (current_background);
}
- gtk_widget_set_visible (WID ("slide_image"), changes_with_time);
- gtk_widget_set_visible (WID ("slide-label"), changes_with_time);
+ gtk_revealer_set_reveal_child (GTK_REVEALER (WID ("wallpaper-info")),
+ changes_with_time);
gtk_widget_queue_draw (WID ("background-desktop-drawingarea"));
}
@@ -181,16 +181,16 @@ get_or_create_cached_pixbuf (CcBackgroundPanel *panel,
gdk_pixbuf_get_width (pixbuf) != preview_width ||
gdk_pixbuf_get_height (pixbuf) != preview_height) {
- gtk_widget_get_allocation (widget, &allocation);
- scale_factor = gtk_widget_get_scale_factor (widget);
- pixbuf = cc_background_item_get_frame_thumbnail (background,
- panel->thumb_factory,
- preview_width,
- preview_height,
- scale_factor,
- -2, TRUE);
- g_object_set_data_full (G_OBJECT (background), "pixbuf", pixbuf, g_object_unref);
- }
+ gtk_widget_get_allocation (widget, &allocation);
+ scale_factor = gtk_widget_get_scale_factor (widget);
+ pixbuf = cc_background_item_get_frame_thumbnail (background,
+ panel->thumb_factory,
+ preview_width,
+ preview_height,
+ scale_factor,
+ -2, TRUE);
+ g_object_set_data_full (G_OBJECT (background), "pixbuf", pixbuf, g_object_unref);
+ }
return pixbuf;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]