Backport: Include the 'updated' flags in the updateUi signal.

Don't send updateUi for focus in.

Backport of changeset 6331:47a4b85d2fa8.

3 files changed, 8 insertions, 4 deletions

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index ffbfd4beb..934c23cd2 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -498,7 +498,7 @@
 	<td>Morten Brørup</td>
       </tr><tr>
 	<td>Alexey Denisov</td>
-	<td>jedailey</td>
+	<td>Justin Dailey</td>
 	<td>oirfeodent</td>
 	<td>A-R-C-A</td>
       </tr><tr>
@@ -548,6 +548,11 @@
 	<a href="http://sourceforge.net/p/scintilla/bugs/1949/">Bug #1949</a>.
 	</li>
 	<li>
+	On Qt, the updateUi signal includes the 'updated' flags.
+	No updateUi signal is sent for focus in events.
+	These changes make Qt behave more like the other platforms.
+	</li>
+	<li>
 	On Qt, mouse tracking is reenabled when the window is reshown.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1948/">Bug #1948</a>.
 	</li>
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp
index 519db5468..dabdce105 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.cpp
+++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp
@@ -181,7 +181,6 @@ void ScintillaEditBase::wheelEvent(QWheelEvent *event)
 void ScintillaEditBase::focusInEvent(QFocusEvent *event)
 {
 	sqt->SetFocusState(true);
-	emit updateUi();
 
 	QAbstractScrollArea::focusInEvent(event);
 }
@@ -701,7 +700,7 @@ void ScintillaEditBase::notifyParent(SCNotification scn)
 			break;
 
 		case SCN_UPDATEUI:
-			emit updateUi();
+			emit updateUi(scn.updated);
 			break;
 
 		case SCN_MODIFIED:
diff --git a/qt/ScintillaEditBase/ScintillaEditBase.h b/qt/ScintillaEditBase/ScintillaEditBase.h
index b1151c55d..8ca05da46 100644
--- a/qt/ScintillaEditBase/ScintillaEditBase.h
+++ b/qt/ScintillaEditBase/ScintillaEditBase.h
@@ -86,7 +86,7 @@ signals:
 	void modifyAttemptReadOnly();
 	void key(int key);
 	void doubleClick(int position, int line);
-	void updateUi();
+	void updateUi(int updated);
 	void modified(int type, int position, int length, int linesAdded,
 	              const QByteArray &text, int line, int foldNow, int foldPrev);
 	void macroRecord(int message, uptr_t wParam, sptr_t lParam);