[Libreoffice-commits] core.git: vcl/source
Tamás Zolnai
tamas.zolnai at collabora.com
Thu May 17 21:19:18 UTC 2018
vcl/source/window/floatwin.cxx | 5 ++++-
vcl/source/window/paint.cxx | 5 +++++
2 files changed, 9 insertions(+), 1 deletion(-)
New commits:
commit cee3840c01292dc3ef98d996d00f57f43eb35e9e
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date: Wed May 16 17:36:36 2018 +0200
lok: Always specify the invalidate rectangle explicitely
It will be needed for a later change in online code.
Change-Id: Ic8f898b78ccaaaec849a1894b5e70fb730d70d6d
Reviewed-on: https://gerrit.libreoffice.org/54443
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 19c8ed1b5748..f52aafeac5ab 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -594,8 +594,11 @@ void FloatingWindow::LogicInvalidate(const tools::Rectangle* /*pRectangle*/)
{
if (VclPtr<vcl::Window> pParent = GetParentWithLOKNotifier())
{
+ std::vector<vcl::LOKPayloadItem> aPayload;
+ const tools::Rectangle aRect(Point(0,0), Size(GetSizePixel().Width()+1, GetSizePixel().Height()+1));
+ aPayload.push_back(std::make_pair(OString("rectangle"), aRect.toString()));
const vcl::ILibreOfficeKitNotifier* pNotifier = pParent->GetLOKNotifier();
- pNotifier->notifyWindow(GetLOKWindowId(), "invalidate");
+ pNotifier->notifyWindow(GetLOKWindowId(), "invalidate", aPayload);
}
}
diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index b4e814b158c1..d8243588496b 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -1198,6 +1198,11 @@ void Window::LogicInvalidate(const tools::Rectangle* pRectangle)
std::vector<vcl::LOKPayloadItem> aPayload;
if (pRectangle)
aPayload.push_back(std::make_pair(OString("rectangle"), pRectangle->toString()));
+ else
+ {
+ const tools::Rectangle aRect(Point(0, 0), GetSizePixel());
+ aPayload.push_back(std::make_pair(OString("rectangle"), aRect.toString()));
+ }
pNotifier->notifyWindow(GetLOKWindowId(), "invalidate", aPayload);
}
More information about the Libreoffice-commits
mailing list