diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-22 15:20:16 +0300 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2019-07-09 11:40:27 +0200 |
commit | 02b18afcfc75bdc714ad4569be41ad14fb2f1392 (patch) | |
tree | 31c7d642d0efca09729b78570db3fc75e298f44b /include/svtools | |
parent | faa5768a67d804652de43b3e9c982b82f73c8911 (diff) |
Get rid of ValueSet's internal VirtualDevice, draw to RenderContext
This improves support for Online HiDPI scenarios.
Change-Id: I1d4d13d8877b761cabaefa028dcd50d8345d9893
Reviewed-on: https://gerrit.libreoffice.org/74241
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
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 b085a3e9e314..dacdd25eb5eb 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -197,8 +197,6 @@ typedef std::vector<std::unique_ptr<SvtValueSetItem>> SvtValueItemList; class SVT_DLLPUBLIC ValueSet : public Control { private: - - ScopedVclPtr<VirtualDevice> maVirDev; Timer maTimer; ValueItemList mItemList; std::unique_ptr<ValueSetItem> mpNoneItem; @@ -248,11 +246,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; @@ -273,6 +270,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 ); @@ -372,7 +371,6 @@ public: void SetExtraSpacing( sal_uInt16 nNewSpacing ); - void Format(vcl::RenderContext const & rRenderContext); void SetFormat(); void StartSelection(); |