diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-28 17:40:22 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-07-28 17:43:31 +0200 |
| commit | 09bd5846d57bf6b506b0967d664b2f80562e03fc (patch) | |
| tree | f1fc681859c52c1865b5863bd0c26e50c769a918 /include | |
| parent | 372d416692e0f5a6f1a3a97ff6f967eaab54233c (diff) | |
tdf#92982 vcl: move Invert() member functions from vcl::Window to OutputDevice
With this, vcl::Cursor will be able to paint to a vcl::RenderContext,
too; not just directly, which is needed for double-buffering.
Change-Id: I868f6cd9b08afe59611ef266911a894a26cacedc
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 19 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 15 |
2 files changed, 19 insertions, 15 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 7c4a27a3b2b3..325291b516e6 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -288,6 +288,18 @@ namespace o3tl template<> struct typed_flags<GetDefaultFontFlags> : is_typed_flags<GetDefaultFontFlags, 0x01> {}; } +// Flags for Invert() +enum class InvertFlags +{ + NONE = 0x0000, + Highlight = 0x0001, + N50 = 0x0002, +}; +namespace o3tl +{ + template<> struct typed_flags<InvertFlags> : is_typed_flags<InvertFlags, 0x0003> {}; +} + enum OutDevType { OUTDEV_DONTKNOW, OUTDEV_WINDOW, OUTDEV_PRINTER, OUTDEV_VIRDEV }; enum OutDevViewType { OUTDEV_VIEWTYPE_DONTKNOW, OUTDEV_VIEWTYPE_PRINTPREVIEW, OUTDEV_VIEWTYPE_SLIDESHOW }; @@ -753,6 +765,13 @@ public: ///@} + /** @name Invert functions + */ + ///@{ +public: + void Invert( const Rectangle& rRect, InvertFlags nFlags = InvertFlags::NONE ); + void Invert( const Polygon& rPoly, InvertFlags nFlags = InvertFlags::NONE ); + ///@} /** @name Line functions */ diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 46d0176ea2c2..f700794e021e 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -280,18 +280,6 @@ namespace o3tl template<> struct typed_flags<ParentClipMode> : is_typed_flags<ParentClipMode, 0x0003> {}; } -// Flags for Invert() -enum class InvertFlags -{ - NONE = 0x0000, - Highlight = 0x0001, - N50 = 0x0002, -}; -namespace o3tl -{ - template<> struct typed_flags<InvertFlags> : is_typed_flags<InvertFlags, 0x0003> {}; -} - // Flags for ShowTracking() #define SHOWTRACK_SMALL ((sal_uInt16)0x0001) #define SHOWTRACK_BIG ((sal_uInt16)0x0002) @@ -1244,9 +1232,6 @@ public: virtual void ShowFocus(const Rectangle& rRect); void HideFocus(); - void Invert( const Rectangle& rRect, InvertFlags nFlags = InvertFlags::NONE ); - void Invert( const Polygon& rPoly, InvertFlags nFlags = InvertFlags::NONE ); - // transparent background for selected or checked items in toolboxes etc. void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, bool bChecked, bool bDrawBorder, bool bDrawExtBorderOnly ); // support rounded edges in the selection rect |