From 3ee1ba1e9a8019e98012bc77ff3953363b2fa17a Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Tue, 12 Apr 2016 12:28:18 +0200
Subject: Add option for larger icons (useful for 4K display).

(bzr r14789)
---
 src/widgets/icon.cpp    | 8 ++++++++
 src/widgets/toolbox.cpp | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/widgets')

diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 542d16797..f998cd66d 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -257,6 +257,14 @@ gboolean IconImpl::draw(GtkWidget *widget, cairo_t* cr)
         image = gtk_render_icon_pixbuf(gtk_widget_get_style_context(widget), 
                                        source, 
                                        (GtkIconSize)-1);
+
+        // gtk_render_icon_pixbuf deprecated, replaced by:
+        // GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
+        // image = gtk_icon_theme_load_icon (icon_theme,
+        //                                   name,
+        //                                   32,
+        //                                   0,
+        //                                   NULL);
 #else
         image = gtk_style_render_icon(gtk_widget_get_style(widget), source, 
 			gtk_widget_get_direction(widget),
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 3389f82f9..0697ff0fb 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -127,7 +127,8 @@ Inkscape::IconSize ToolboxFactory::prefToSize( Glib::ustring const &path, int ba
     static Inkscape::IconSize sizeChoices[] = {
         Inkscape::ICON_SIZE_LARGE_TOOLBAR,
         Inkscape::ICON_SIZE_SMALL_TOOLBAR,
-        Inkscape::ICON_SIZE_MENU
+        Inkscape::ICON_SIZE_MENU,
+        Inkscape::ICON_SIZE_DIALOG
     };
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int index = prefs->getIntLimited( path, base, 0, G_N_ELEMENTS(sizeChoices) );
-- 
cgit v1.2.3