From 18b3486a064e45d77526f8f270231283087c17c3 Mon Sep 17 00:00:00 2001 From: William Jon McCann Date: Fri, 10 Aug 2012 18:52:12 -0400 Subject: [PATCH] background: Remove sheen overlay The metaphor was valid when we used a monitor to display the preview but now it doesn't work. There is no glass to reflect light. It distracts from the preview and may look like a defect. https://bugzilla.gnome.org/show_bug.cgi?id=676539 --- panels/background/Makefile.am | 3 +-- panels/background/cc-background-panel.c | 19 ------------------- panels/background/display-overlay.png | Bin 6700 -> 0 bytes 3 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 panels/background/display-overlay.png diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am index bc40aff16..e1d98fe9d 100644 --- a/panels/background/Makefile.am +++ b/panels/background/Makefile.am @@ -3,8 +3,7 @@ cappletname = background uidir = $(pkgdatadir)/ui/background dist_ui_DATA = \ - background.ui \ - display-overlay.png + background.ui slideshowicondir = $(datadir)/icons/hicolor/scalable/categories/ dist_slideshowicon_DATA = slideshow-symbolic.svg diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c index 137a515ab..7faeacba3 100644 --- a/panels/background/cc-background-panel.c +++ b/panels/background/cc-background-panel.c @@ -62,7 +62,6 @@ struct _CcBackgroundPanelPrivate GtkWidget *spinner; - GdkPixbuf *display_overlay; GdkPixbuf *display_screenshot; char *screenshot_path; }; @@ -110,12 +109,6 @@ cc_background_panel_dispose (GObject *object) priv->thumb_factory = NULL; } - if (priv->display_overlay) - { - g_object_unref (priv->display_overlay); - priv->display_overlay = NULL; - } - if (priv->display_screenshot) { g_object_unref (priv->display_screenshot); @@ -246,14 +239,6 @@ update_display_preview (CcBackgroundPanel *panel) cairo_paint (cr); } - if (priv->display_overlay) - { - gdk_cairo_set_source_pixbuf (cr, - priv->display_overlay, - 0, 0); - cairo_paint (cr); - } - cairo_destroy (cr); } @@ -728,10 +713,6 @@ cc_background_panel_init (CcBackgroundPanel *self) priv->copy_cancellable = g_cancellable_new (); - priv->display_overlay = gdk_pixbuf_new_from_file (DATADIR - "/display-overlay.png", - NULL); - priv->thumb_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); load_current_bg (self); diff --git a/panels/background/display-overlay.png b/panels/background/display-overlay.png deleted file mode 100644 index f5cf78553c944a02f64b299006192862396324f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6700 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 F{{u)VLb(6{