From 7c0efaab356d082dd95baf8fe40dbfb413b6d506 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 20 May 2015 12:16:56 +0200 Subject: lokdocview: use postMouseEvent(LOK_MOUSEEVENT_MOUSEMOVE) This is much better than using setTextSelection() directly, as that was introduced only to adjust an existing selection. Change-Id: I881c3e4e5b0c97891f29dac0da42c1d3a51361e8 --- libreofficekit/source/gtk/lokdocview.cxx | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'libreofficekit/source') diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index 47b57a6a016c..2cbd450a7f62 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -103,9 +103,6 @@ struct LOKDocView_Impl bool m_bInDragGraphicHandles[8]; ///@} - /// If text selection is adjusted -> then mouse up event is a NOP. - bool m_bTextSelectionAdjusted; - /// Callback data, allocated in lok_docview_callback_worker(), released in lok_docview_callback(). struct CallbackData { @@ -261,8 +258,8 @@ LOKDocView_Impl::LOKDocView_Impl(LOKDocView* pDocView) m_pHandleEnd(0), m_aHandleEndRect({0, 0, 0, 0}), m_bInDragEndHandle(false), - m_pGraphicHandle(0), - m_bTextSelectionAdjusted(false) + + m_pGraphicHandle(0) { memset(&m_aGraphicHandleRects, 0, sizeof(m_aGraphicHandleRects)); memset(&m_bInDragGraphicHandles, 0, sizeof(m_bInDragGraphicHandles)); @@ -454,20 +451,16 @@ gboolean LOKDocView_Impl::signalButtonImpl(GdkEventButton* pEvent) if ((pEvent->time - m_nLastButtonPressTime) < 250) nCount++; m_nLastButtonPressTime = pEvent->time; - m_bTextSelectionAdjusted = false; m_pDocument->pClass->postMouseEvent(m_pDocument, LOK_MOUSEEVENT_MOUSEBUTTONDOWN, pixelToTwip(pEvent->x), pixelToTwip(pEvent->y), nCount); break; } case GDK_BUTTON_RELEASE: { - if (!m_bTextSelectionAdjusted) - { - int nCount = 1; - if ((pEvent->time - m_nLastButtonReleaseTime) < 250) - nCount++; - m_nLastButtonReleaseTime = pEvent->time; - m_pDocument->pClass->postMouseEvent(m_pDocument, LOK_MOUSEEVENT_MOUSEBUTTONUP, pixelToTwip(pEvent->x), pixelToTwip(pEvent->y), nCount); - } + int nCount = 1; + if ((pEvent->time - m_nLastButtonReleaseTime) < 250) + nCount++; + m_nLastButtonReleaseTime = pEvent->time; + m_pDocument->pClass->postMouseEvent(m_pDocument, LOK_MOUSEEVENT_MOUSEBUTTONUP, pixelToTwip(pEvent->x), pixelToTwip(pEvent->y), nCount); break; } default: @@ -548,9 +541,8 @@ gboolean LOKDocView_Impl::signalMotionImpl(GdkEventButton* pEvent) return FALSE; } - // Otherwise adjust the text selection, as on the desktop. - m_pDocument->pClass->setTextSelection(m_pDocument, LOK_SETTEXTSELECTION_END, pixelToTwip(pEvent->x), pixelToTwip(pEvent->y)); - m_bTextSelectionAdjusted = true; + // Otherwise a mouse move, as on the desktop. + m_pDocument->pClass->postMouseEvent(m_pDocument, LOK_MOUSEEVENT_MOUSEMOVE, pixelToTwip(pEvent->x), pixelToTwip(pEvent->y), 1); return FALSE; } -- cgit