summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-08-28 23:09:07 +0200
committerBram Moolenaar <Bram@vim.org>2018-08-28 23:09:07 +0200
commita449a7c6b986b8f5b28c61b8f628e69ed43ca030 (patch)
treeb10fa8c45a82f5c85aef1d0c33387c165c3b4379
parentfc65cabb15d0236bce001ad78e12a40511caf941 (diff)
downloadvim-git-a449a7c6b986b8f5b28c61b8f628e69ed43ca030.tar.gz
patch 8.1.0332: get Gdk-Critical error on first balloon showv8.1.0332
Problem: Get Gdk-Critical error on first balloon show. Solution: Get screen geometry using the draw area widget. (Davit Samvelyan, closes #3386)
-rw-r--r--src/gui_beval.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_beval.c b/src/gui_beval.c
index 03216008e..5e70d61bf 100644
--- a/src/gui_beval.c
+++ b/src/gui_beval.c
@@ -958,7 +958,7 @@ drawBalloon(BalloonEval *beval)
screen = gtk_widget_get_screen(beval->target);
gtk_window_set_screen(GTK_WINDOW(beval->balloonShell), screen);
# endif
- gui_gtk_get_screen_geom_of_win(beval->balloonShell,
+ gui_gtk_get_screen_geom_of_win(beval->target,
&screen_x, &screen_y, &screen_w, &screen_h);
# if !GTK_CHECK_VERSION(3,0,0)
gtk_widget_ensure_style(beval->balloonShell);
diff --git a/src/version.c b/src/version.c
index e2123eb9d..243e213d2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 332,
+/**/
331,
/**/
330,