From 151024eeb48b3b72abd221558831d7744a4b0b13 Mon Sep 17 00:00:00 2001
From: Colomban Wendling <ban@herbesfolles.org>
Date: Sun, 25 Oct 2015 21:57:36 +0100
Subject: GTK: Fix autoc popup row height on GTK2 when it changes at runtime

Now the popup is cached the row height has to be re-computed when the
font changes on GTK2 too.

Closes [bugs:1774].
---
 doc/ScintillaHistory.html | 4 ++++
 gtk/PlatGTK.cxx           | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 3609396ac..92da04123 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -537,6 +537,10 @@
 	at the time the ScintillaView was deleted although there may have been other cases.
 	</li>
 	<li>
+	On GTK+ 2.x, fix height of lines in autocompletion lists.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1774/">Bug #1774</a>.
+	</li>
+	<li>
 	Fix bug with SCI_LINEENDDISPLAY where the caret moved to the next document line instead of the
 	end of the display line.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1772/">Bug #1772</a>.
diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index e690e0c8e..58b0e1364 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -1691,11 +1691,11 @@ void ListBoxX::SetFont(Font &scint_font) {
 			gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(cssProvider),
 				ssFontSetting.str().c_str(), -1, NULL);
 		}
-		gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), -1);
-		gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), 1);
 #else
 		gtk_widget_modify_font(PWidget(list), PFont(scint_font)->pfd);
 #endif
+		gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), -1);
+		gtk_cell_renderer_text_set_fixed_height_from_font(GTK_CELL_RENDERER_TEXT(renderer), 1);
 	}
 }
 
-- 
cgit v1.2.3