diff options
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/SidebarWin.hxx | 1 | ||||
| -rw-r--r-- | sw/qa/extras/tiledrendering/tiledrendering.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/PostItMgr.cxx | 3 | ||||
| -rw-r--r-- | sw/source/uibase/docvw/SidebarWin.cxx | 14 |
4 files changed, 22 insertions, 4 deletions
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx index 579a97432022..adfb47c16118 100644 --- a/sw/inc/SidebarWin.hxx +++ b/sw/inc/SidebarWin.hxx @@ -119,6 +119,7 @@ class SwSidebarWin : public vcl::Window void ShowAnchorOnly(const Point &aPoint); void ShowNote(); void HideNote(); + void InvalidateControl(); void ResetAttributes(); diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx index 7b441d67648a..19a40665d2df 100644 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx @@ -1506,6 +1506,14 @@ void SwTiledRenderingTest::testCommentEndTextEdit() // of the comment. CPPUNIT_ASSERT(!aView1.m_bOwnCursorAtOrigin); + // Hit enter and expect invalidation. + Scheduler::ProcessEventsToIdle(); + aView1.m_bTilesInvalidated = false; + pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 0, KEY_RETURN); + pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, KEY_RETURN); + Scheduler::ProcessEventsToIdle(); + CPPUNIT_ASSERT(aView1.m_bTilesInvalidated); + mxComponent->dispose(); mxComponent.clear(); comphelper::LibreOfficeKit::setActive(false); diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx index f5316cce0f26..4199cc0f9792 100644 --- a/sw/source/uibase/docvw/PostItMgr.cxx +++ b/sw/source/uibase/docvw/PostItMgr.cxx @@ -742,7 +742,10 @@ void SwPostItMgr::LayoutPostIts() comphelper::LibreOfficeKit::setTiledPainting(!(*i)->HasChildPathFocus()); (*i)->ShowNote(); if (!bTiledPainting) + { comphelper::LibreOfficeKit::setTiledPainting(bTiledPainting); + (*i)->InvalidateControl(); + } } else { diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index 9d8e7d640ebd..a1a8224c8342 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1199,10 +1199,7 @@ void SwSidebarWin::ShowNote() mpAnchor->setVisible(true); // Invalidate. - mpSidebarTextControl->Push(PushFlags::MAPMODE); - lcl_translateTwips(EditWin(), *mpSidebarTextControl, nullptr); - mpSidebarTextControl->Invalidate(); - mpSidebarTextControl->Pop(); + InvalidateControl(); } void SwSidebarWin::HideNote() @@ -1220,6 +1217,15 @@ void SwSidebarWin::HideNote() mpShadow->setVisible(false); } +void SwSidebarWin::InvalidateControl() +{ + // Invalidate. + mpSidebarTextControl->Push(PushFlags::MAPMODE); + lcl_translateTwips(EditWin(), *mpSidebarTextControl, nullptr); + mpSidebarTextControl->Invalidate(); + mpSidebarTextControl->Pop(); +} + void SwSidebarWin::ActivatePostIt() { mrMgr.AssureStdModeAtShell(); |