diff options
| author | Justin Dailey <unknown> | 2017-07-01 12:36:00 +1000 |
|---|---|---|
| committer | Justin Dailey <unknown> | 2017-07-01 12:36:00 +1000 |
| commit | 0da32f46338d24a5648c30110024227fe09baaad (patch) | |
| tree | 80a60edcebdd1a92025844bb352cb6e276b5bc73 /qt/ScintillaEditBase | |
| parent | 70bcf2eae87231fce230fa990e5511b8f3133a3a (diff) | |
| download | scintilla-mirror-0da32f46338d24a5648c30110024227fe09baaad.tar.gz | |
Backport: Include the 'updated' flags in the updateUi signal.
Don't send updateUi for focus in.
Backport of changeset 6331:47a4b85d2fa8.
Diffstat (limited to 'qt/ScintillaEditBase')
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 3 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.h | 2 |
2 files changed, 2 insertions, 3 deletions
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); |
