diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-02-01 19:55:51 +0100 |
|---|---|---|
| committer | Tamás Zolnai <tamas.zolnai@collabora.com> | 2018-02-02 13:03:51 +0100 |
| commit | 974ea04ddd1b82e5d5c0171bd8ad29310e3f2bd7 (patch) | |
| tree | ffce41fbe7a4cb2e0ce5b8c46b30ba53e58d2dd8 /cui | |
| parent | c984fa9fcc0128f545bb1315e80d97bb888e9edf (diff) | |
lokdialog: Color/font picker in dialogs don't show preview
Invalidation needs to be passed upward to the right parent window.
It should work similar to other dialog items, but this preview class
is not derived from the Control class.
Change-Id: I5fb2b6438b8be92d55609c8d3c25110b49d0e6d7
Reviewed-on: https://gerrit.libreoffice.org/49101
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 00bdcd0cadd8..3926e04f83fd 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -24,6 +24,7 @@ #include <vcl/msgbox.hxx> #include <vcl/settings.hxx> #include <vcl/idle.hxx> +#include <vcl/window.hxx> #include <tools/urlobj.hxx> #include <sfx2/dialoghelper.hxx> #include <sfx2/objsh.hxx> @@ -51,6 +52,7 @@ #include <svl/intitem.hxx> #include <sfx2/request.hxx> #include <svtools/grfmgr.hxx> +#include <comphelper/lok.hxx> using namespace css; @@ -154,6 +156,7 @@ protected: virtual void Paint( vcl::RenderContext& /*rRenderContext*/, const ::tools::Rectangle& rRect ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; virtual void Resize() override; + virtual void LogicInvalidate(const ::tools::Rectangle* pRectangle) override; private: @@ -310,6 +313,25 @@ void BackgroundPreviewImpl::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } + +void BackgroundPreviewImpl::LogicInvalidate(const ::tools::Rectangle* /*pRectangle*/) +{ + // Invalidate the container dialog or floating window + // The code is same as in Control::LogicInvalidate() method + if (comphelper::LibreOfficeKit::isActive() && !comphelper::LibreOfficeKit::isDialogPainting()) + { + if (VclPtr<vcl::Window> pParent = GetParentWithLOKNotifier()) + { + // invalidate the complete floating window for now + if (pParent->ImplIsFloatingWindow()) + return pParent->LogicInvalidate(nullptr); + + const ::tools::Rectangle aRect(Point(GetOutOffXPixel(), GetOutOffYPixel()), Size(GetOutputWidthPixel(), GetOutputHeightPixel())); + pParent->LogicInvalidate(&aRect); + } + } +} + #define HDL(hdl) LINK(this,SvxBackgroundTabPage,hdl) SvxBackgroundTabPage::SvxBackgroundTabPage(vcl::Window* pParent, const SfxItemSet& rCoreSet) |