diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 5 | ||||
| -rw-r--r-- | qt/ScintillaEditBase/ScintillaEditBase.cpp | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 60671bebe..6c608bdfc 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -510,6 +510,7 @@ <td>John Flatness</td> <td>Thorsten Kani</td> <td>Bernhard M. Wiedemann</td> + <td>Baldur Karlsson</td> </tr> </table> <p> @@ -534,6 +535,10 @@ <li> Support dropped for GTK+ versions before 2.24. </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> </ul> <h3> <a href="http://www.scintilla.org/scite375.zip">Release 3.7.5</a> diff --git a/qt/ScintillaEditBase/ScintillaEditBase.cpp b/qt/ScintillaEditBase/ScintillaEditBase.cpp index 4b7d29440..616fd2323 100644 --- a/qt/ScintillaEditBase/ScintillaEditBase.cpp +++ b/qt/ScintillaEditBase/ScintillaEditBase.cpp @@ -132,6 +132,9 @@ bool ScintillaEditBase::event(QEvent *event) // Circumvent the tab focus convention. keyPressEvent(static_cast<QKeyEvent *>(event)); result = event->isAccepted(); + } else if (event->type() == QEvent::Show) { + setMouseTracking(true); + result = QAbstractScrollArea::event(event); } else if (event->type() == QEvent::Hide) { setMouseTracking(false); result = QAbstractScrollArea::event(event); |