From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 8 Jun 2018 08:32:47 +0000 (+0200)
Subject: Unbreak completion in text mode
X-Git-Tag: 2.3.1~73
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=00ec2dd10648ba3220ce97c7502897520bb85ac6;p=features.git

Unbreak completion in text mode

Completion uses a complicated async scheme based on timers to update
itself. This is probably not necessary anymore and is fragile to
event order changes.

This is what happens with the new painting scheme. Therefore the
asyncHideXXX() methods have to be made more robust and detect whether
completion state has changed by the time they are triggered.

(cherry picked from commit f1ea7fee5cda3fbbeb9fdbb8bec2bd91c0745e56)
---

diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index 9858b8d01a..f2e4eda81f 100644
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -538,7 +538,9 @@ void GuiCompleter::showPopup(Cursor const & cur)
 void GuiCompleter::asyncHidePopup()
 {
 	popup()->hide();
-	if (!inlineVisible())
+	// do not clear model if it has been set by an event before the
+	// timeout got triggered.
+	if (!modelActive_ && !inlineVisible())
 		model_->setList(0);
 }
 
@@ -573,7 +575,9 @@ void GuiCompleter::hideInline(Cursor const & cur)
 
 void GuiCompleter::asyncHideInline()
 {
-	if (!popupVisible())
+	// do not clear model if it has been set by an event before the
+	// timeout got triggered.
+	if (!modelActive_ && !popupVisible())
 		model_->setList(0);
 }