[LyX/master] Workaround Qtbug regarding the QAbstractScrollArea::mouseMoveEvent(...) (06969f9d) is only needed until Qt 5.15.1 as it was fixed there.

[Yu Jin]

Am Do., 10. Sept. 2020 um 20:41 Uhr schrieb Eugene Chornyi <yu_jin at lyx.org>:

> commit 46da0d9d4d704ba0ad238be6bc78804600016203
> Author: Eugene Chornyi <yu_jin at lyx.org>
> Date:   Thu Sep 10 20:40:48 2020 +0200
>
>     Workaround Qtbug regarding the
> QAbstractScrollArea::mouseMoveEvent(...) (06969f9d) is only needed until Qt
> 5.15.1 as it was fixed there.
> ---
>  src/frontends/qt/GuiWorkArea.cpp |    7 +++++--
>  1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/src/frontends/qt/GuiWorkArea.cpp
> b/src/frontends/qt/GuiWorkArea.cpp
> index a2af82d..dd9d1fd 100644
> --- a/src/frontends/qt/GuiWorkArea.cpp
> +++ b/src/frontends/qt/GuiWorkArea.cpp
> @@ -849,7 +849,8 @@ void GuiWorkArea::mouseReleaseEvent(QMouseEvent * e)
>
>         FuncRequest const cmd(LFUN_MOUSE_RELEASE, e->x(), e->y(),
>                         q_button_state(e->button()),
> q_key_state(e->modifiers()));
> -#if (QT_VERSION > QT_VERSION_CHECK(5,10,1))
> +#if (QT_VERSION > QT_VERSION_CHECK(5,10,1) && \
> +       QT_VERSION < QT_VERSION_CHECK(5,15,1))
>         d->synthetic_mouse_event_.cmd = cmd; // QtBug
> QAbstractScrollArea::mouseMoveEvent
>  #endif
>         d->dispatch(cmd);
> @@ -859,7 +860,8 @@ void GuiWorkArea::mouseReleaseEvent(QMouseEvent * e)
>
>  void GuiWorkArea::mouseMoveEvent(QMouseEvent * e)
>  {
> -#if (QT_VERSION > QT_VERSION_CHECK(5,10,1))
> +#if (QT_VERSION > QT_VERSION_CHECK(5,10,1) && \
> +       QT_VERSION < QT_VERSION_CHECK(5,15,1))
>         // cancel the event if the coordinates didn't change, this is due
> to QtBug
>         // QAbstractScrollArea::mouseMoveEvent, the event is triggered
> falsely when quickly
>         // double tapping a touchpad. To test: try to select a word by
> quickly double tapping
> @@ -867,6 +869,7 @@ void GuiWorkArea::mouseMoveEvent(QMouseEvent * e)
>         // This bug does not occur on Qt versions 5.10.1 and below. Only
> Windows seems to be affected.
>         // ML thread:
> https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg211699.html
>         // Qt bugtracker: https://bugreports.qt.io/browse/QTBUG-85431
> +       // Bug was fixed in Qt 5.15.1
>         if (e->x() == d->synthetic_mouse_event_.cmd.x() && // QtBug
> QAbstractScrollArea::mouseMoveEvent
>                         e->y() == d->synthetic_mouse_event_.cmd.y()) //
> QtBug QAbstractScrollArea::mouseMoveEvent
>                 return; // QtBug QAbstractScrollArea::mouseMoveEvent
> --
> lyx-cvs mailing list
> lyx-cvs at lists.lyx.org
> http://lists.lyx.org/mailman/listinfo/lyx-cvs
>

Is this ok to commit to stable together with the previous commit regarding
this QtBug (06969f9d)? I guess it should be safe now :)
-- 
    Eugene
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20200910/2a6254ef/attachment.html>