summaryrefslogtreecommitdiffstats
path: root/src/ui/previewholder.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2016-05-06 11:02:22 +0000
committertavmjong-free <tavmjong@free.fr>2016-05-06 11:02:22 +0000
commit28d4af68e5f0c3c157b97fd857ef676657b35e01 (patch)
tree65cc1de05c4dc7a139381d0bc486c07cca7689c5 /src/ui/previewholder.cpp
parentFix rendering of tool bar icons in GTK3. Fix some GTK3 warnings. (diff)
downloadinkscape-28d4af68e5f0c3c157b97fd857ef676657b35e01.tar.gz
inkscape-28d4af68e5f0c3c157b97fd857ef676657b35e01.zip
Prevent scrollbar overlay from covering swatches in GTK3 build.
And some minor cleanup. (bzr r14871)
Diffstat (limited to 'src/ui/previewholder.cpp')
-rw-r--r--src/ui/previewholder.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index 21f3f38d7..beb83f35c 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -340,6 +340,12 @@ void PreviewHolder::calcGridSize( const Gtk::Widget* thing, int itemCount, int&
width = itemCount;
height = 1;
+#if GTK_CHECK_VERSION(3,16,0)
+ // Disable overlay scrolling as the scrollbar covers up swatches.
+ // For some reason this also makes the height 55px.
+ ((Gtk::ScrolledWindow *)_scroller)->set_overlay_scrolling(false);
+#endif
+
if ( _anchor == SP_ANCHOR_SOUTH || _anchor == SP_ANCHOR_NORTH ) {
Gtk::Requisition req;
#if GTK_CHECK_VERSION(3,0,0)