diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-22 15:20:16 +0300 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-12-10 13:02:00 +0100 |
| commit | b98e2566331a92e8aed52cbca95b8df3041d2144 (patch) | |
| tree | 69154e3ca87d1753455110acfbde9a3ca99204eb /include/svtools | |
| parent | dce903b181e1618dd931c048ef3b73a2ecab1e76 (diff) | |
Get rid of ValueSet's internal VirtualDevice, draw to RenderContext
This improves support for Online HiDPI scenarios.
Change-Id: I1d4d13d8877b761cabaefa028dcd50d8345d9893
Diffstat (limited to 'include/svtools')
| -rw-r--r-- | include/svtools/valueset.hxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 0f70c177ee1b..6d67061c79b9 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -194,8 +194,6 @@ typedef std::vector<ValueSetItem*> ValueItemList; class SVT_DLLPUBLIC ValueSet : public Control { private: - - ScopedVclPtr<VirtualDevice> maVirDev; Timer maTimer; ValueItemList mItemList; std::unique_ptr<ValueSetItem> mpNoneItem; @@ -245,11 +243,10 @@ private: SVT_DLLPRIVATE void ImplInitScrollBar(); SVT_DLLPRIVATE void ImplDeleteItems(); - SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext const & rRenderContext, ValueSetItem* pItem, tools::Rectangle aRect); + SVT_DLLPRIVATE void ImplFormatItem(vcl::RenderContext& rRenderContext, ValueSetItem* pItem, tools::Rectangle aRect); SVT_DLLPRIVATE void ImplDrawItemText(vcl::RenderContext& rRenderContext, const OUString& rStr); SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext& rRenderContext, sal_uInt16 nItemId, const bool bFocus, const bool bDrawSel); SVT_DLLPRIVATE void ImplDrawSelect(vcl::RenderContext& rRenderContext); - SVT_DLLPRIVATE void ImplHideSelect(sal_uInt16 nItemId); SVT_DLLPRIVATE void ImplHighlightItem(sal_uInt16 nItemId, bool bIsSelection = true); SVT_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext); using Window::ImplScroll; @@ -270,6 +267,8 @@ private: ValueSet (const ValueSet &) = delete; ValueSet & operator= (const ValueSet &) = delete; + SVT_DLLPRIVATE void Format(vcl::RenderContext& rRenderContext); + protected: void StartDrag( const CommandEvent& rCEvt, vcl::Region& rRegion ); @@ -375,7 +374,6 @@ public: void SetExtraSpacing( sal_uInt16 nNewSpacing ); - void Format(vcl::RenderContext const & rRenderContext); void SetFormat(); void StartSelection(); |