Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Wed, 17 Jun 2015 23:37:00 UTC Commit: 67b464a586f62d2e4294f9325ac72d977ad34828 https://github.com/geany/geany/commit/67b464a586f62d2e4294f9325ac72d977ad348...

Log Message: ----------- 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.

X-Scintilla-Commit-ID: e9f9c964236a6b740f75d09a8b0ac76e5d6dd09f

Modified Paths: -------------- scintilla/gtk/PlatGTK.cxx

Modified: scintilla/gtk/PlatGTK.cxx 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1507,7 +1507,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) {

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).