From 0964ec395a33e8299a5caebb122c73687d1b428e Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 13 Nov 2015 13:33:32 +0100 Subject: [PATCH 323/398] sw lok: fix blinking cursor position of comments With this, it is possible to click inside a comment (and get a blinking cursor inside a comment), and also possible to use the arrow keys to native around and still get correct blinking cursor position. (cherry picked from commit 5fb91dfd804cd6f3d585bb4113b9a68083ac71ee) Change-Id: I29eb1e60e4e571151f0b18bec8cf765ea09af09f --- sw/inc/SidebarWin.hxx | 5 ++-- sw/source/uibase/docvw/PostItMgr.cxx | 4 ++-- sw/source/uibase/docvw/SidebarTxtControl.hxx | 2 +- sw/source/uibase/docvw/SidebarWin.cxx | 36 ++++++++++++++++++++++++---- sw/source/uibase/docvw/edtwin.cxx | 7 ------ 5 files changed, 38 insertions(+), 16 deletions(-) diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index c41352749c28..e3899d5a1a8b 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -179,9 +179,10 @@ class SwSidebarWin : public vcl::Window virtual void Draw(OutputDevice* pDev, const Point&, const Size&, sal_uLong) override; virtual void KeyInput(const KeyEvent& rKeyEvt) override; + virtual void MouseButtonDown(const MouseEvent& rMouseEvent) override; void PaintTile(vcl::RenderContext& rRenderContext, const Rectangle& rRect); - /// Get the matching sub-widget inside this sidebar widget for rPointLogic, if any. - vcl::Window* IsHitWindow(const Point& rPointLogic); + /// Is there a matching sub-widget inside this sidebar widget for rPointLogic? + bool IsHitWindow(const Point& rPointLogic); protected: virtual void DataChanged( const DataChangedEvent& aEvent) SAL_OVERRIDE; diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index 703a433a44ee..871a642d24da 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -1736,9 +1736,9 @@ vcl::Window* SwPostItMgr::IsHitSidebarWindow(const Point& rPointLogic) if (!pPostIt) continue; - if (vcl::Window* pWindow = pPostIt->IsHitWindow(rPointLogic)) + if (pPostIt->IsHitWindow(rPointLogic)) { - pRet = pWindow; + pRet = pPostIt; break; } } diff --git a/sw/source/uibase/docvw/SidebarTxtControl.hxx b/sw/source/uibase/docvw/SidebarTxtControl.hxx index 4f47ef4a2177..43d6b98d82c1 100644 --- a/sw/source/uibase/docvw/SidebarTxtControl.hxx +++ b/sw/source/uibase/docvw/SidebarTxtControl.hxx @@ -41,7 +41,6 @@ class SidebarTextControl : public Control protected: virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void Command( const CommandEvent& rCEvt ) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; @@ -61,6 +60,7 @@ class SidebarTextControl : public Control virtual void GetFocus() override; virtual void KeyInput( const KeyEvent& rKeyEvt ) override; + virtual void MouseButtonDown(const MouseEvent& rMouseEvent) override; OutlinerView* GetTextView() const; diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index a40c82de5470..dd8d2a6003b9 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -280,12 +280,10 @@ void SwSidebarWin::PaintTile(vcl::RenderContext& rRenderContext, const Rectangle rRenderContext.Push(PushFlags::NONE); } -vcl::Window* SwSidebarWin::IsHitWindow(const Point& rPointLogic) +bool SwSidebarWin::IsHitWindow(const Point& rPointLogic) { Rectangle aRectangleLogic(EditWin()->PixelToLogic(GetPosPixel()), EditWin()->PixelToLogic(GetSizePixel())); - if (aRectangleLogic.IsInside(rPointLogic)) - return mpSidebarTextControl; - return 0; + return aRectangleLogic.IsInside(rPointLogic); } void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, sal_uLong nInFlags) @@ -356,10 +354,40 @@ void SwSidebarWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz, s } } +/// We want to work in absolute twips: so set delta between rChild and rParent as origin on rChild, then disable map mode on rChild. +static void lcl_setAbsoluteTwips(vcl::Window& rParent, vcl::Window& rChild) +{ + Point aOffset(rChild.GetOutOffXPixel() - rParent.GetOutOffXPixel(), rChild.GetOutOffYPixel() - rParent.GetOutOffYPixel()); + MapMode aMapMode(rChild.GetMapMode()); + aMapMode.SetOrigin(rChild.PixelToLogic(aOffset)); + rChild.SetMapMode(aMapMode); + rChild.EnableMapMode(false); +} + void SwSidebarWin::KeyInput(const KeyEvent& rKeyEvent) { if (mpSidebarTextControl) + { + mpSidebarTextControl->Push(PushFlags::MAPMODE); + lcl_setAbsoluteTwips(*EditWin(), *mpSidebarTextControl); + mpSidebarTextControl->KeyInput(rKeyEvent); + + mpSidebarTextControl->Pop(); + } +} + +void SwSidebarWin::MouseButtonDown(const MouseEvent& rMouseEvent) +{ + if (mpSidebarTextControl) + { + mpSidebarTextControl->Push(PushFlags::MAPMODE); + lcl_setAbsoluteTwips(*EditWin(), *mpSidebarTextControl); + + mpSidebarTextControl->MouseButtonDown(rMouseEvent); + + mpSidebarTextControl->Pop(); + } } void SwSidebarWin::SetPosSizePixelRect(long nX, long nY, long nWidth, long nHeight, diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx index 10cdc0dca561..53d0afd38f94 100644 --- a/sw/source/uibase/docvw/edtwin.cxx +++ b/sw/source/uibase/docvw/edtwin.cxx @@ -2771,14 +2771,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt) { if (vcl::Window* pWindow = m_rView.GetPostItMgr()->IsHitSidebarWindow(rMEvt.GetPosPixel())) { - bool bDisableMapMode = pWindow->IsMapModeEnabled(); - if (bDisableMapMode) - pWindow->EnableMapMode(false); - pWindow->MouseButtonDown(rMEvt); - - if (bDisableMapMode) - pWindow->EnableMapMode(); return; } } -- 2.12.0