[Libreoffice-commits] core.git: include/vcl vcl/source
Miklos Vajna
vmiklos at collabora.co.uk
Tue Jul 28 08:45:23 PDT 2015
include/vcl/outdev.hxx | 19 +++++++++++
include/vcl/window.hxx | 15 ---------
vcl/source/outdev/rect.cxx | 66 ++++++++++++++++++++++++++++++++++++++++
vcl/source/window/window2.cxx | 68 ------------------------------------------
4 files changed, 85 insertions(+), 83 deletions(-)
New commits:
commit 09bd5846d57bf6b506b0967d664b2f80562e03fc
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Tue Jul 28 17:40:22 2015 +0200
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
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 7c4a27a..325291b 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 46d0176..f700794 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
diff --git a/vcl/source/outdev/rect.cxx b/vcl/source/outdev/rect.cxx
index b06a52b..d786649 100644
--- a/vcl/source/outdev/rect.cxx
+++ b/vcl/source/outdev/rect.cxx
@@ -129,6 +129,72 @@ void OutputDevice::DrawRect( const Rectangle& rRect,
mpAlphaVDev->DrawRect( rRect, nHorzRound, nVertRound );
}
+void OutputDevice::Invert( const Rectangle& rRect, InvertFlags nFlags )
+{
+ if ( !IsDeviceOutputNecessary() )
+ return;
+
+ Rectangle aRect( ImplLogicToDevicePixel( rRect ) );
+
+ if ( aRect.IsEmpty() )
+ return;
+ aRect.Justify();
+
+ // we need a graphics
+ if ( !mpGraphics )
+ {
+ if ( !AcquireGraphics() )
+ return;
+ }
+
+ if ( mbInitClipRegion )
+ InitClipRegion();
+
+ if ( mbOutputClipped )
+ return;
+
+ SalInvert nSalFlags = 0;
+ if ( nFlags & InvertFlags::Highlight )
+ nSalFlags |= SAL_INVERT_HIGHLIGHT;
+ if ( nFlags & InvertFlags::N50 )
+ nSalFlags |= SAL_INVERT_50;
+ mpGraphics->Invert( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), nSalFlags, this );
+}
+
+void OutputDevice::Invert( const Polygon& rPoly, InvertFlags nFlags )
+{
+ if ( !IsDeviceOutputNecessary() )
+ return;
+
+ sal_uInt16 nPoints = rPoly.GetSize();
+
+ if ( nPoints < 2 )
+ return;
+
+ Polygon aPoly( ImplLogicToDevicePixel( rPoly ) );
+
+ // we need a graphics
+ if ( !mpGraphics )
+ {
+ if ( !AcquireGraphics() )
+ return;
+ }
+
+ if ( mbInitClipRegion )
+ InitClipRegion();
+
+ if ( mbOutputClipped )
+ return;
+
+ SalInvert nSalFlags = 0;
+ if ( nFlags & InvertFlags::Highlight )
+ nSalFlags |= SAL_INVERT_HIGHLIGHT;
+ if ( nFlags & InvertFlags::N50 )
+ nSalFlags |= SAL_INVERT_50;
+ const SalPoint* pPtAry = reinterpret_cast<const SalPoint*>(aPoly.GetConstPointAry());
+ mpGraphics->Invert( nPoints, pPtAry, nSalFlags, this );
+}
+
void OutputDevice::DrawCheckered(const Point& rPos, const Size& rSize, sal_uInt32 nLen, Color aStart, Color aEnd)
{
assert(!is_double_buffered_window());
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index be4409c..7ba1c6a 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -127,74 +127,6 @@ void Window::HideFocus()
mpWindowImpl->mbInHideFocus = false;
}
-void Window::Invert( const Rectangle& rRect, InvertFlags nFlags )
-{
- if ( !IsDeviceOutputNecessary() )
- return;
-
- OutputDevice *pOutDev = GetOutDev();
- Rectangle aRect( pOutDev->ImplLogicToDevicePixel( rRect ) );
-
- if ( aRect.IsEmpty() )
- return;
- aRect.Justify();
-
- // we need a graphics
- if ( !mpGraphics )
- {
- if ( !pOutDev->AcquireGraphics() )
- return;
- }
-
- if ( mbInitClipRegion )
- InitClipRegion();
-
- if ( mbOutputClipped )
- return;
-
- SalInvert nSalFlags = 0;
- if ( nFlags & InvertFlags::Highlight )
- nSalFlags |= SAL_INVERT_HIGHLIGHT;
- if ( nFlags & InvertFlags::N50 )
- nSalFlags |= SAL_INVERT_50;
- mpGraphics->Invert( aRect.Left(), aRect.Top(), aRect.GetWidth(), aRect.GetHeight(), nSalFlags, this );
-}
-
-void Window::Invert( const Polygon& rPoly, InvertFlags nFlags )
-{
- if ( !IsDeviceOutputNecessary() )
- return;
-
- sal_uInt16 nPoints = rPoly.GetSize();
-
- if ( nPoints < 2 )
- return;
-
- OutputDevice *pOutDev = GetOutDev();
- Polygon aPoly( pOutDev->ImplLogicToDevicePixel( rPoly ) );
-
- // we need a graphics
- if ( !mpGraphics )
- {
- if ( !pOutDev->AcquireGraphics() )
- return;
- }
-
- if ( mbInitClipRegion )
- InitClipRegion();
-
- if ( mbOutputClipped )
- return;
-
- SalInvert nSalFlags = 0;
- if ( nFlags & InvertFlags::Highlight )
- nSalFlags |= SAL_INVERT_HIGHLIGHT;
- if ( nFlags & InvertFlags::N50 )
- nSalFlags |= SAL_INVERT_50;
- const SalPoint* pPtAry = reinterpret_cast<const SalPoint*>(aPoly.GetConstPointAry());
- mpGraphics->Invert( nPoints, pPtAry, nSalFlags, this );
-}
-
void Window::ShowTracking( const Rectangle& rRect, sal_uInt16 nFlags )
{
ImplWinData* pWinData = ImplGetWinData();
More information about the Libreoffice-commits
mailing list