diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-06 21:00:48 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-06 21:00:48 +0000 |
| commit | 21b8afc070567499476e1e902faf454057c7adab (patch) | |
| tree | c57167f1ad89b745fc05eb20db216da4c94316ea /src/ui/previewholder.cpp | |
| parent | Finishing eraser tool. TODO undo work (diff) | |
| parent | Prevent scrollbar overlay from covering swatches in GTK3 build. (diff) | |
| download | inkscape-21b8afc070567499476e1e902faf454057c7adab.tar.gz inkscape-21b8afc070567499476e1e902faf454057c7adab.zip | |
update to trunk
(bzr r14865.1.3)
Diffstat (limited to 'src/ui/previewholder.cpp')
| -rw-r--r-- | src/ui/previewholder.cpp | 6 |
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) |