From 28d4af68e5f0c3c157b97fd857ef676657b35e01 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 6 May 2016 13:02:22 +0200
Subject: Prevent scrollbar overlay from covering swatches in GTK3 build. And
 some minor cleanup.

(bzr r14871)
---
 src/ui/previewholder.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/ui/previewholder.cpp')

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)
-- 
cgit v1.2.3