summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2010-07-25 01:09:40 +0000
committerJon A. Cruz <jon@joncruz.org>2010-07-25 01:09:40 +0000
commitda0c135e8e2e78cb169defb0cb15c84e733375fa (patch)
tree39d6e1786dc0337cdd2acb81b55e4082c37b06f5 /src
parentPatch by Krzysztof to fix handles when node sculpting (diff)
downloadinkscape-da0c135e8e2e78cb169defb0cb15c84e733375fa.tar.gz
inkscape-da0c135e8e2e78cb169defb0cb15c84e733375fa.zip
Adding preference to suppress packing of previews.
(bzr r9606.1.18)
Diffstat (limited to 'src')
-rw-r--r--src/preferences-skeleton.h4
-rw-r--r--src/ui/dialog/icon-preview.cpp4
2 files changed, 6 insertions, 2 deletions
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index c73cae17f..283960b80 100644
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -391,7 +391,9 @@ static char const preferences_skeleton[] =
" </group>\n"
"\n"
" <group\n"
-" id=\"iconpreview\">\n"
+" id=\"iconpreview\"\n"
+" pack=\"1\"\n"
+" selectionOnly=\"0\">\n"
" <group\n"
" id=\"sizes\">\n"
" <group\n"
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 9a46254ab..7be667383 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -96,6 +96,8 @@ IconPreviewPanel::IconPreviewPanel() :
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
numEntries = 0;
+ bool pack = prefs->getBool("/iconpreview/pack", true);
+
std::vector<Glib::ustring> pref_sizes = prefs->getAllDirs("/iconpreview/sizes/default");
std::vector<int> rawSizes;
@@ -182,7 +184,7 @@ IconPreviewPanel::IconPreviewPanel() :
align->add(*buttons[i]);
int pad = 12;
- if ((avail == 0) && (previous == 0)) {
+ if ( !pack || ( (avail == 0) && (previous == 0) ) ) {
verts->pack_end(*align, Gtk::PACK_SHRINK);
previous = sizes[i];
avail = sizes[i];