diff options
| author | Colomban Wendling <ban@herbesfolles.org> | 2015-06-02 14:45:22 +0200 |
|---|---|---|
| committer | Colomban Wendling <ban@herbesfolles.org> | 2015-06-02 14:45:22 +0200 |
| commit | 0070aef502f7ecd0935b768e96d359db829dc7bc (patch) | |
| tree | 40ffee5624e3b53f3855ca5368e3c70cb6b10c25 | |
| parent | 2a357880621606722259d322a118b2ad378da366 (diff) | |
| download | scintilla-mirror-0070aef502f7ecd0935b768e96d359db829dc7bc.tar.gz | |
GTK: Fix runtime completion popup warning
GtkScrolledWindow in GTK 3.16 might have a minimum and natural height
of 0 if GTK_OVERLAY_SCROLLING is enabled (which is the default), so we
need to fix our overridden minimal height to never be greater than the
natural height.
Do that by only changing the minimal height if it is greater than what
we want.
I don't know why we didn't use to set 0 here, but it might be that a
height of 0 caused problems on older GTK versions, so keep 1 to be sure.
| -rw-r--r-- | gtk/PlatGTK.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 63d0c466d..f91fbdbe0 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -1514,7 +1514,8 @@ G_DEFINE_TYPE(SmallScroller, small_scroller, GTK_TYPE_SCROLLED_WINDOW) #if GTK_CHECK_VERSION(3,0,0) static void small_scroller_get_preferred_height(GtkWidget *widget, gint *min, gint *nat) { GTK_WIDGET_CLASS(small_scroller_parent_class)->get_preferred_height(widget, min, nat); - *min = 1; + if (*min > 1) + *min = 1; } #else static void small_scroller_size_request(GtkWidget *widget, GtkRequisition *req) { |