GNOME Bugzilla – Bug 788515
Background settings redesign
Last modified: 2018-07-18 00:26:24 UTC
Created attachment 360910 [details] mockup of the wallpaper grid on the panel and the preview mode The current background settings panel design has several issues, including * there is no way to preview a wallpaper without setting it * it doesn't use the additional space on larger monitors * setting a wallpaper requires at least 3 clicks * trying a number of wallpapers before choosing one requires going back to the start every time This proposed redesign fixes these issues by * introducing a preview mode that makes it possible to see wallpapers in full screen without setting them * showing the 3 most recently set wallpapers from each category at the top of the list * setting the desktop and lock screen wallpaper simultaneously, which makes it possible to only have a single panel, without an intermediate step More information on the proposal here: https://wiki.gnome.org/Design/SystemSettings/Background
I think that is still missing the adding custom colors feature. Probably, just by adding a simple link button to a color picker would great.
(In reply to Miguel Vaello Martínez from comment #1) > I think that is still missing the adding custom colors feature. Probably, > just by adding a simple link button to a color picker would great. Sorry, I didn't see the Redesigned v3.
gnome-control-center:wip/jsparber/background has an initial implementation by Julian Sparber.
Created attachment 367993 [details] [review] background: start implementing the new design for the background panel Start implementing the redesign v3 proposal made by Tobias Bernard wiki page: https://wiki.gnome.org/Design/SystemSettings/Background
Created attachment 367994 [details] [review] background: change margin around background preview to 16
Created attachment 367995 [details] [review] background: add buttons on bottom of gallery without functionality
Created attachment 367996 [details] [review] background: fix border on top of the gallery and add ids for buttons
Created attachment 367998 [details] [review] background: start implementing the new design for the background panel Start implementing the redesign v3 proposal made by Tobias Bernard wiki page: https://wiki.gnome.org/Design/SystemSettings/Background
Created attachment 367999 [details] [review] background: change margin around background preview to 16
Created attachment 368000 [details] [review] background: add buttons on bottom of gallery without functionality
Created attachment 368001 [details] [review] background: fix border on top of the gallery and add ids for buttons
Created attachment 368002 [details] [review] background: add handler for "Photo" and "Files" button
Created attachment 368003 [details] [review] background: clean up and fix build warnings
Created attachment 368004 [details] [review] background: clear settings object in dispose
Created attachment 368005 [details] [review] background: resize preview when the window size is less then 500px
Created attachment 368006 [details] [review] background: add slide icon to time changing wallpapers
Created attachment 368007 [details] [review] background: add space around slide icon
Created attachment 368008 [details] [review] background: change margins for preview to 16px
Created attachment 368009 [details] [review] background: change size of preview when panel is heigher then 700
Created attachment 368010 [details] [review] background: resize thumbnail to fill space a row
Created attachment 368011 [details] [review] background: change gallery wallpaper size
Created attachment 368012 [details] [review] background: use same margin size everywhere around the flowbox
Created attachment 368013 [details] [review] background: add icon for with time changing wallpapers
Created attachment 368014 [details] [review] background: moved gallery item code to grid-item class
Created attachment 368015 [details] [review] background: add white space around gallery, set min itmes per line to 5
Created attachment 368016 [details] [review] background: set max children for line to 5
Created attachment 368017 [details] [review] background: set wallpaper and lockscreen
Created attachment 368018 [details] [review] background: fix code style issues and remove commented code
Created attachment 368019 [details] [review] background: fix build warning by casting obj to gtkWidget https://bugzilla.gnome.org/show_bug.cgi?id=788515<Paste>
Created attachment 368020 [details] [review] background: remove private struct of cc-background-store
Created attachment 368021 [details] [review] background: remove CcBackgroundStore constructer move code from CcBackgroundStore::constructed to ::init
Created attachment 368022 [details] [review] background: start implementing the new design for the background panel Start implementing the redesign v3 proposal made by Tobias Bernard wiki page: https://wiki.gnome.org/Design/SystemSettings/Background
Created attachment 368023 [details] [review] background: change margin around background preview to 16
Created attachment 368024 [details] [review] background: add buttons on bottom of gallery without functionality
Created attachment 368025 [details] [review] background: fix border on top of the gallery and add ids for buttons
Created attachment 368026 [details] [review] background: add handler for "Photo" and "Files" button
Created attachment 368027 [details] [review] background: clean up and fix build warnings
Created attachment 368028 [details] [review] background: clear settings object in dispose
Created attachment 368029 [details] [review] background: resize preview when the window size is less then 500px
Created attachment 368030 [details] [review] background: add slide icon to time changing wallpapers
Created attachment 368031 [details] [review] background: add space around slide icon
Created attachment 368032 [details] [review] background: change margins for preview to 16px
Created attachment 368033 [details] [review] background: change size of preview when panel is heigher then 700
Created attachment 368034 [details] [review] background: resize thumbnail to fill space a row
Created attachment 368035 [details] [review] background: change gallery wallpaper size
Created attachment 368036 [details] [review] background: use same margin size everywhere around the flowbox
Created attachment 368037 [details] [review] background: add icon for with time changing wallpapers
Created attachment 368038 [details] [review] background: moved gallery item code to grid-item class
Created attachment 368039 [details] [review] background: add white space around gallery, set min itmes per line to 5
Created attachment 368040 [details] [review] background: set max children for line to 5
Created attachment 368041 [details] [review] background: set wallpaper and lockscreen
Created attachment 368042 [details] [review] background: fix code style issues and remove commented code
Created attachment 368043 [details] [review] background: fix build warning by casting obj to gtkWidget https://bugzilla.gnome.org/show_bug.cgi?id=788515<Paste>
Created attachment 368044 [details] [review] background: remove private struct of cc-background-store
Created attachment 368045 [details] [review] background: remove CcBackgroundStore constructer move code from CcBackgroundStore::constructed to ::init
Created attachment 368046 [details] [review] background: make cc_background_grid_item_set_ref static and private
Created attachment 368047 [details] [review] background: change name cc_background_grid_item_get_ref change function name to cc_background_grid_item_get_item
Created attachment 368048 [details] [review] background: less exposure of the the wallpaper store use a wrapper to bind the GListModel to a flowbox
Created attachment 368049 [details] [review] background: change base obj of CcBackgroundGridItem CcBackgroundGridItem derives directly from GtkDrawingWidget. And some small code style fixes.
Created attachment 368050 [details] [review] background: CcBackgroundGridItem::new returns its own typ
Created attachment 368051 [details] [review] background: cache tumbnail for wallpaper gallery for a redraw
Created attachment 368052 [details] [review] background: changed variable names and small style changes
Created attachment 368053 [details] [review] background: cache slideshow-emblem icon
Created attachment 368054 [details] [review] background: show only top border for gallery view
Created attachment 368055 [details] [review] background: remove chooser gallery from meson.build (needs work)
Created attachment 368056 [details] [review] background: adapt meson.build for file changes - remove file for the chooser gallery - add new source files - move background.ui to data - fix build warnings
Created attachment 368057 [details] [review] background: remove old source files and images form git
Created attachment 368058 [details] [review] background: change description for open in File and open in photo apps
Created attachment 368059 [details] [review] background: fix merge mistakes created during rebase
Created attachment 368060 [details] [review] background: fix crash of g-c-c by opening gnome-photos move g_object_unref (context) to the right line
Created attachment 368061 [details] [review] background: use autoptr where possible
Created attachment 368062 [details] [review] background: remove bg-source and bg-wallpapers-source files
Created attachment 368063 [details] [review] background: fix code style and spaces https://bugzilla.gnome.org/show_bug.cgi?id=788515<Paste>
Created attachment 368064 [details] [review] background: fix code style: remove empty line
Created attachment 368065 [details] [review] background: add Julian Sparber as author to cc-background-panel.c
Created attachment 368066 [details] [review] background: fix build warning: set slideshow_emblem to NULL
Comments on the latest design: - The colour section was dropped: "i mostly felt that the colours were not as interesting as the other wallpapers. also felt a little antiquated". I would still have a colour section, even if it doesn't need to include all the possible values it had before, maybe just enough to have a full line with a way to select one from a dialogue. - It's unclear from the mockups whether the preview section at the top is supposed to scroll or not. In the current implementation it doesn't, which limits the view for background selection - The "load from a custom file" through Files and/or Photos is probably not prominent enough, and you can bet this will be a problem in use. - We really want a way to select the lock screen and wallpaper separately. On phones, the lock screen is usually something personal (a family photo for example) because the device is personal, and usually only seen by the user themself and the main wallpaper something simpler because it makes the programme launcher easier to parse. gnome-shell is (mostly) targeted at desktops and laptops where a family photo as the lock screen background could be a privacy leak (same reason we allow to hide notification contents on the lock screen, and don't show the person's name until you get to the password prompt), and unlocked backgrounds can be more complicated, as gnome-shell blurs the background to put its overview on top. Implementation: - The panel opening is sluggish, because there are a number of timeouts or operations in the main loop that take too long. You can use this patch against GLib to see which calls are taking too long: https://gist.github.com/hadess/230450e781141c2236271b55b5e0b8bf A number of the calls currently take between 0.75 msecs up to 228 msecs, 16 msecs is the maximum we should aim for, for a smooth experience (no blocking). The old background panel could achieve this. Don't forget to name your timeouts and idles. - The currently selected background isn't selected and scrolled to when opening the panel. - Please squash your patches as appropriate, in particular, bug fixes to your earlier commits need to be merged into the commit itself. Each commit needs to be buildable, and bring the implementation closer to the design in iterative ways. Things like "fix merge mistakes created during rebase" are really not appropriate for merging. I'd wait until the design is more settled before doing more implementation work, to save you some unnecessary churn.
Thx for the review > Implementation: > - The panel opening is sluggish, because there are a number of timeouts or > operations in the main loop that take too long. You can use this patch > against GLib to see which calls are taking too long: > https://gist.github.com/hadess/230450e781141c2236271b55b5e0b8bf > A number of the calls currently take between 0.75 msecs up to 228 msecs, 16 > msecs is the maximum we should aim for, for a smooth experience (no > blocking). The old background panel could achieve this. Don't forget to name > your timeouts and idles. I will try to improve the delays, but i think aiming for less the 16 msecs is quite difficult, on my system the settings panel has close to no calls under 20 msec and also the old background panel has calls slower then 150 msec. I guess this times depend heavily on the computer's performance. > - The currently selected background isn't selected and scrolled to when > opening the panel. Do we want this? > - Please squash your patches as appropriate, in particular, bug fixes to > your earlier commits need to be merged into the commit itself. Each commit > needs to be buildable, and bring the implementation closer to the design in > iterative ways. Things like "fix merge mistakes created during rebase" are > really not appropriate for merging. I will clean up the commits
(In reply to Bastien Nocera from comment #77) > Comments on the latest design: > - The colour section was dropped: "i mostly felt that the colours were not > as interesting as the other wallpapers. also felt a little antiquated". I > would still have a colour section, even if it doesn't need to include all > the possible values it had before, maybe just enough to have a full line > with a way to select one from a dialogue. I'm not convinced that the colours provide a great experience for our users. Even if they seem appealing initially, they grow tired quite quickly. To be blunt - I don't think they look that great. There's also the issue of choice. Having one set of high quality images to choose from, rather than different types in sections, is obviously much more straightforward and direct. > - It's unclear from the mockups whether the preview section at the top is > supposed to scroll or not. In the current implementation it doesn't, which > limits the view for background selection It makes sense to me that the preview at the top doesn't scroll, since it provides feedback about what the current background is. If we want to make the image grid larger, we could experiment with making the preview smaller, either permanently or having it shrink when you scroll down. > - The "load from a custom file" through Files and/or Photos is probably not > prominent enough, and you can bet this will be a problem in use. I quite like the current design, in terms of the progression from the grid to the other options. If someone is coming to the panel with the intention of setting one of their own images as the background, I can see how it might be an issue though. I'm sure there are options to resolve this. Perhaps these options they could go in a popover that's accessed from a button at the top, for example. > - We really want a way to select the lock screen and wallpaper separately. > On phones, the lock screen is usually something personal (a family photo for > example) because the device is personal, and usually only seen by the user > themself and the main wallpaper something simpler because it makes the > programme launcher easier to parse. gnome-shell is (mostly) targeted at > desktops and laptops where a family photo as the lock screen background > could be a privacy leak (same reason we allow to hide notification contents > on the lock screen, and don't show the person's name until you get to the > password prompt), and unlocked backgrounds can be more complicated, as > gnome-shell blurs the background to put its overview on top. To summarise: someone might want a private image on their background and a non-private one for their lock screen. That was indeed the original motivation behind having a separate lock screen background. The challenge, I think, is that most people aren't interested in setting separate backgrounds for their wallpaper and their lock sceen. This is partly due to the fact that it's extra work - generally people just want to pick a picture that they like and move on. However, it's also a result of the fact that the background wallpaper is generally obscured - even if you do set separate images for the background and lock screen, you're often not going to get the benefit. So while I can see the rationale for separate wallpaper and lock screen backgrounds, I don't see it working out in practice. One option might be to explore secondary ways to set a lock screen image, although there is an obvious complexity overhead in doing that.
(In reply to Allan Day from comment #79) > (In reply to Bastien Nocera from comment #77) > > Comments on the latest design: > > - The colour section was dropped: "i mostly felt that the colours were not > > as interesting as the other wallpapers. also felt a little antiquated". I > > would still have a colour section, even if it doesn't need to include all > > the possible values it had before, maybe just enough to have a full line > > with a way to select one from a dialogue. > > I'm not convinced that the colours provide a great experience for our users. > Even if they seem appealing initially, they grow tired quite quickly. To be > blunt - I don't think they look that great. > > There's also the issue of choice. Having one set of high quality images to > choose from, rather than different types in sections, is obviously much more > straightforward and direct. Flat colours are useful in a number of situations, and offering at least a black option, and the option to select one's favourite colour is still going to be useful for "unbranded" backgrounds and various testing. > > - It's unclear from the mockups whether the preview section at the top is > > supposed to scroll or not. In the current implementation it doesn't, which > > limits the view for background selection > > It makes sense to me that the preview at the top doesn't scroll, since it > provides feedback about what the current background is. If we want to make > the image grid larger, we could experiment with making the preview smaller, > either permanently or having it shrink when you scroll down. It's already pretty small compared to the old one, and I would think that an even smaller version wouldn't stop the user from > > - The "load from a custom file" through Files and/or Photos is probably not > > prominent enough, and you can bet this will be a problem in use. > > I quite like the current design, in terms of the progression from the grid > to the other options. If someone is coming to the panel with the intention > of setting one of their own images as the background, I can see how it might > be an issue though. I'm sure there are options to resolve this. Perhaps > these options they could go in a popover that's accessed from a button at > the top, for example. The key problem is discoverability. Both bottom of the scrollview and in a popover would qualify as not discoverable enough. > > - We really want a way to select the lock screen and wallpaper separately. > > On phones, the lock screen is usually something personal (a family photo for > > example) because the device is personal, and usually only seen by the user > > themself and the main wallpaper something simpler because it makes the > > programme launcher easier to parse. gnome-shell is (mostly) targeted at > > desktops and laptops where a family photo as the lock screen background > > could be a privacy leak (same reason we allow to hide notification contents > > on the lock screen, and don't show the person's name until you get to the > > password prompt), and unlocked backgrounds can be more complicated, as > > gnome-shell blurs the background to put its overview on top. > > To summarise: someone might want a private image on their background and a > non-private one for their lock screen. That was indeed the original > motivation behind having a separate lock screen background. > > The challenge, I think, is that most people aren't interested in setting > separate backgrounds for their wallpaper and their lock sceen. This is > partly due to the fact that it's extra work - generally people just want to > pick a picture that they like and move on. People are used to doing that on their smartphones, I don't think it's that much of a stretch to think they'd like to do the same on their laptops or desktops. > However, it's also a result of > the fact that the background wallpaper is generally obscured - even if you > do set separate images for the background and lock screen, you're often not > going to get the benefit. > > So while I can see the rationale for separate wallpaper and lock screen > backgrounds, I don't see it working out in practice. > > One option might be to explore secondary ways to set a lock screen image, > although there is an obvious complexity overhead in doing that. The problem here is that the implementation sets both the lock screen and background images at once. I don't think that's intended, and I'll chalk it off as an implementation bug.
(and finishing the sentence) > > - It's unclear from the mockups whether the preview section at the top is > > supposed to scroll or not. In the current implementation it doesn't, which > > limits the view for background selection > > It makes sense to me that the preview at the top doesn't scroll, since it > provides feedback about what the current background is. If we want to make > the image grid larger, we could experiment with making the preview smaller, > either permanently or having it shrink when you scroll down. It's already pretty small compared to the old one, and I would think that an even smaller version wouldn't stop the user from being able to identify the background they selected. But a big version when scrolled all the way up and smaller when scrolling down would be a nice touch.
Replying selectively... (In reply to Bastien Nocera from comment #80) ... > Flat colours are useful in a number of situations, and offering at least a > black option, and the option to select one's favourite colour is still going > to be useful for "unbranded" backgrounds and various testing. It sounds like we might have to agree to disagree on this one. My feeling is that the colours are sub-optimal, and we shouldn't offer sub-optimal choices - because people will choose them. ... > > > - The "load from a custom file" through Files and/or Photos is probably not > > > prominent enough, and you can bet this will be a problem in use. ... > The key problem is discoverability. Both bottom of the scrollview and in a > popover would qualify as not discoverable enough. Do you have a suggestion for how these options should be presented? In terms of prioritisation, it seems appropriate to make the image gallery the most prominent thing - otherwise the UI could get a bit confused.
(In reply to Allan Day from comment #82) > Replying selectively... > > (In reply to Bastien Nocera from comment #80) > ... > > Flat colours are useful in a number of situations, and offering at least a > > black option, and the option to select one's favourite colour is still going > > to be useful for "unbranded" backgrounds and various testing. > > It sounds like we might have to agree to disagree on this one. My feeling is > that the colours are sub-optimal, and we shouldn't offer sub-optimal choices > - because people will choose them. We added black recently: https://bugzilla.gnome.org/show_bug.cgi?id=778648 > ... > > > > - The "load from a custom file" through Files and/or Photos is probably not > > > > prominent enough, and you can bet this will be a problem in use. > ... > > The key problem is discoverability. Both bottom of the scrollview and in a > > popover would qualify as not discoverable enough. > > Do you have a suggestion for how these options should be presented? In terms > of prioritisation, it seems appropriate to make the image gallery the most > prominent thing - otherwise the UI could get a bit confused. I have no idea what this might look like, sorry.
Created attachment 368488 [details] [review] background: start implementing the new design for the background panel Start implementing the redesign v3 proposal made by Tobias Bernard wiki page: https://wiki.gnome.org/Design/SystemSettings/Background
Created attachment 368489 [details] [review] background: add buttons at bottom of the gallery - Add buttons for "Photo" and "Files" at the bottom of the gallery - Change the border on top of the gallery - clean up and fix build warnings
Created attachment 368491 [details] [review] background: clear settings object in dispose
Created attachment 368492 [details] [review] background: resize preview based on window size Preview: - resize preview when window is higher then 700px - set margins for preview to 16px Gallery: - move gallery item code to grid-item class - add slide icon to time changing wallpapers - expand thumbnails to fill a gallery row - change gallery thumbnails size - use same margin everywhere around the flowbox - add white space around gallery and min/max item per line
Created attachment 368493 [details] [review] background: set wallpaper and lockscreen
Created attachment 368494 [details] [review] background: clean up code - remove commented code and fix style - remove build warnings https://bugzilla.gnome.org/show_bug.cgi?id=788515<Paste>
Created attachment 368495 [details] [review] background: refactor cc-background-store - remove private struct of cc-background-store - remove CcBackgroundStore constructor - less exposure of the the wallpaper store use a wrapper to bind the GListModel to a flowbox
Created attachment 368496 [details] [review] background: refactor cc-background-grid-item - make cc_background_grid_item_set_ref static and private - change cc_background_grid_item_get_ref to cc_background_grid_item_get_item - change base obj of CcBackgroundGridItem CcBackgroundGridItem derives directly from GtkDrawingWidget - CcBackgroundGridItem::new returns its own type
Created attachment 368497 [details] [review] background: cache tumbnail for wallpaper gallery for a redraw
Created attachment 368498 [details] [review] background: changed variable names and small style changes
Created attachment 368499 [details] [review] background: cache slideshow-emblem icon
Created attachment 368500 [details] [review] background: show only top border for gallery view
Created attachment 368501 [details] [review] background: adapt meson.build for file changes - remove file for the chooser gallery from meson.build - add new source files to meson.build - move background.ui to data - remove old source files and images from git - fix build warnings
Created attachment 368502 [details] [review] background: change description for open in File and open in photo apps
Created attachment 368503 [details] [review] background: use autoptr where possible
Created attachment 368504 [details] [review] background: clean up files and code and remove build warnings - remove bg-source and bg-wallpapers-source files - remove build warnings - add Julian Sparber as author to cc-background-panel.c
Comment on attachment 368024 [details] [review] background: add buttons on bottom of gallery without functionality >From f1c961d8801feabd1705959629c963042184945d Mon Sep 17 00:00:00 2001 >From: Julian Sparber <julian@sparber.net> >Date: Sun, 5 Nov 2017 13:30:41 +0100 >Subject: [PATCH] background: add buttons on bottom of gallery without > functionality > >https://bugzilla.gnome.org/show_bug.cgi?id=788515 >--- > panels/background/background.ui | 65 ++++++++++++++++++++++++++++++++++- > panels/background/data/background.css | 1 + > 2 files changed, 65 insertions(+), 1 deletion(-) > >diff --git a/panels/background/background.ui b/panels/background/background.ui >index aae1f6bb1..dec1227b6 100644 >--- a/panels/background/background.ui >+++ b/panels/background/background.ui >@@ -137,9 +137,72 @@ > <property name="valign">center</property> > <property name="margin">25</property> > <property name="margin_top">50</property> >+ <property name="margin_bottom">32</property> >+ </object> >+ </child> >+ <child> >+ <object class="GtkBox"> >+ <property name="visible">True</property> >+ <property name="can_focus">False</property> >+ <property name="halign">center</property> >+ <property name="valign">end</property> >+ <property name="margin">32</property> >+ <property name="margin_top">0</property> >+ <property name="orientation">vertical</property> >+ <property name="spacing">16</property> >+ <child> >+ <object class="GtkLabel"> >+ <property name="visible">True</property> >+ <property name="can_focus">False</property> >+ <property name="label" translatable="yes">Photos or Files can be used to set any image as the background</property> >+ </object> >+ <packing> >+ <property name="expand">False</property> >+ <property name="fill">True</property> >+ <property name="position">0</property> >+ </packing> >+ </child> >+ <child> >+ <object class="GtkBox"> >+ <property name="visible">True</property> >+ <property name="can_focus">False</property> >+ <property name="halign">center</property> >+ <property name="spacing">16</property> >+ <child> >+ <object class="GtkButton"> >+ <property name="label" translatable="yes">Open Photos app</property> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="receives_default">True</property> >+ </object> >+ <packing> >+ <property name="expand">False</property> >+ <property name="fill">True</property> >+ <property name="position">0</property> >+ </packing> >+ </child> >+ <child> >+ <object class="GtkButton"> >+ <property name="label" translatable="yes">Open Pictures folder</property> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="receives_default">True</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="fill">True</property> >+ <property name="position">1</property> >+ </packing> >+ </child> > </object> > </child> >- > </object> > </child> > </object> >diff --git a/panels/background/data/background.css b/panels/background/data/background.css >index c2874a6bd..04695ed40 100644 >--- a/panels/background/data/background.css >+++ b/panels/background/data/background.css >@@ -1,5 +1,6 @@ > .background-gallery { > background: #fff; >+ border-top: 1px solid #b6b6b3; > } > > .black-border { >-- >2.16.1
Comment on attachment 368035 [details] [review] background: change gallery wallpaper size >From fe91ed59475c6547bfee2d1dd6f766515eddab9b Mon Sep 17 00:00:00 2001 >From: Julian Sparber <julian@sparber.net> >Date: Sat, 11 Nov 2017 22:28:27 +0100 >Subject: [PATCH] background: change gallery wallpaper size > >https://bugzilla.gnome.org/show_bug.cgi?id=788515 >--- > panels/background/cc-background-panel.c | 27 +++------------------------ > 1 file changed, 3 insertions(+), 24 deletions(-) > >diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c >index c1e1154e1..dd76ab0c0 100644 >--- a/panels/background/cc-background-panel.c >+++ b/panels/background/cc-background-panel.c >@@ -337,13 +337,11 @@ on_gallery_item_draw (GtkWidget *widget, > { > const gint space_width = gtk_widget_get_allocated_width (widget); > const gint space_height = gtk_widget_get_allocated_height ( (widget)); >- //g_print ("Parent name %s\n", gtk_widget_get_name (gtk_widget_get_parent (widget))); >- > const gint pixbuf_width = gdk_pixbuf_get_width (pixbuf); > const gint pixbuf_height = gdk_pixbuf_get_height (pixbuf); >- > gint new_width; > gint new_height; >+ > if (space_width * 9/16 > space_height) { > new_width = space_width; > new_height = space_width * 9/16; >@@ -925,9 +923,8 @@ create_gallery_item (gpointer item, > if (cc_background_item_changes_with_time (self)) { > add_slideshow_emblem (pixbuf, scale_factor); > } >- //widget = gtk_image_new_from_pixbuf (pixbuf); > widget = gtk_drawing_area_new (); >- gtk_widget_set_size_request (widget, 200, 200 * 9/16); >+ gtk_widget_set_size_request (widget, 250, 250 * 9/16); > gtk_widget_set_hexpand(widget, TRUE); > gtk_widget_set_vexpand(widget, TRUE); > g_signal_connect (G_OBJECT (widget), "draw", >@@ -935,30 +932,12 @@ create_gallery_item (gpointer item, > > flow = cc_background_grid_item_new(self); > >- gtk_widget_set_size_request (flow, 200, 150); >+ gtk_widget_set_size_request (flow, 250, 200); > cc_background_grid_item_set_ref (flow, self); > gtk_widget_show (flow); > gtk_widget_show (widget); >- /*frame = gtk_aspect_frame_new (NULL, >- 0.5, >- 0.5, >- 1.7777, >- FALSE); >- >- gtk_widget_set_size_request (frame, preview_width, -1); >- gtk_frame_set_shadow_type (frame, >- GTK_SHADOW_NONE); >- gtk_container_add (GTK_CONTAINER (frame), widget); >- >- >- gtk_widget_show (frame); >- gtk_container_add (GTK_CONTAINER (flow), frame); >- >-*/ >- > gtk_container_add (GTK_CONTAINER (flow), widget); > >- > return flow; > } > >-- >2.16.1
I squashed the commits to only 16. Hope its better like this
Julian, I only looked at the commits briefly. Could you please squash commits like background: refactor cc-background-grid-item background: refactor cc-background-store into your first commit that introduces those files? We don't need to see the evolution of your coding style in separate commits. As a completely arbitrary guess, maybe your patches can be squashed into like 5 patches or less?
This work is obsolete now. The Background panel received a completely new direction, and it is being tracked in GitLab. Closing.