[Libreoffice-commits] core.git: Branch 'feature/rendercontext' - 2 commits - include/vcl vcl/inc vcl/source
Tomaž Vajngerl
tomaz.vajngerl at collabora.co.uk
Tue Apr 28 16:59:48 PDT 2015
include/vcl/fixed.hxx | 2 +-
vcl/inc/ilstbox.hxx | 6 +++---
vcl/source/control/fixed.cxx | 20 ++++++++++----------
vcl/source/control/group.cxx | 4 ++--
vcl/source/control/ilstbox.cxx | 9 ++++-----
vcl/source/control/imgctrl.cxx | 4 ++--
6 files changed, 22 insertions(+), 23 deletions(-)
New commits:
commit 98bd4b2fdf38d443a70b37711cf0c87b9aadf84a
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Wed Apr 29 08:58:38 2015 +0900
delegate RenderContext, invalidate - ilstbox
Change-Id: I9d47e828a784bf6b120b4b1e9df332ea85690a19
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx
index 6ec2665..8eb2789 100644
--- a/vcl/inc/ilstbox.hxx
+++ b/vcl/inc/ilstbox.hxx
@@ -244,14 +244,14 @@ protected:
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE;
- virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) SAL_OVERRIDE;
+ virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE;
virtual void Resize() SAL_OVERRIDE;
virtual void GetFocus() SAL_OVERRIDE;
virtual void LoseFocus() SAL_OVERRIDE;
bool SelectEntries( sal_Int32 nSelect, LB_EVENT_TYPE eLET, bool bShift = false, bool bCtrl = false, bool bSelectPosChange = false );
- void ImplPaint( sal_Int32 nPos, bool bErase = false, bool bLayout = false );
- void ImplDoPaint( const Rectangle& rRect, bool bLayout = false );
+ void ImplPaint(sal_Int32 nPos, bool bErase = false, bool bLayout = false);
+ void ImplDoPaint(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bLayout = false);
void ImplCalcMetrics();
void ImplUpdateEntryMetrics( ImplEntryType& rEntry );
void ImplCallSelect();
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 93db04f..7d6791f 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -1874,11 +1874,10 @@ void ImplListBoxWindow::DrawEntry( sal_Int32 nPos, bool bDrawImage, bool bDrawTe
void ImplListBoxWindow::FillLayoutData() const
{
mpControlData->mpLayoutData = new vcl::ControlLayoutData();
- const_cast<ImplListBoxWindow*>(this)->
- ImplDoPaint( Rectangle( Point( 0, 0 ), GetOutputSize() ), true );
+ const_cast<ImplListBoxWindow*>(this)->Invalidate(Rectangle(Point(0, 0), GetOutputSize()));
}
-void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout )
+void ImplListBoxWindow::ImplDoPaint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect, bool bLayout)
{
sal_Int32 nCount = mpEntryList->GetEntryCount();
@@ -1908,9 +1907,9 @@ void ImplListBoxWindow::ImplDoPaint( const Rectangle& rRect, bool bLayout )
ImplShowFocusRect();
}
-void ImplListBoxWindow::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect )
+void ImplListBoxWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect)
{
- ImplDoPaint( rRect );
+ ImplDoPaint(rRenderContext, rRect);
}
sal_uInt16 ImplListBoxWindow::GetDisplayLineCount() const
commit 483c027633eb43272d55f47fd81cbff6a13a78d6
Author: Tomaž Vajngerl <tomaz.vajngerl at collabora.co.uk>
Date: Wed Apr 29 08:51:37 2015 +0900
delegate RenderContext - fixed, group, imgctrl
Change-Id: I438eaaa7959465d264ab248234a99c9e37bc56d9
diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx
index 49caf55..571e91d 100644
--- a/include/vcl/fixed.hxx
+++ b/include/vcl/fixed.hxx
@@ -102,7 +102,7 @@ private:
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle );
SAL_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground );
- SAL_DLLPRIVATE void ImplDraw( bool bLayout = false );
+ SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout = false);
protected:
virtual void FillLayoutData() const SAL_OVERRIDE;
diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 963c84a..3bb189d 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -234,9 +234,9 @@ void FixedText::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
);
}
-void FixedText::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void FixedText::Paint( vcl::RenderContext& rRenderContext, const Rectangle& )
{
- ImplDraw( this, 0, Point(), GetOutputSizePixel() );
+ ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel());
}
void FixedText::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
@@ -536,7 +536,7 @@ void FixedLine::ImplInitSettings( bool bFont,
}
}
-void FixedLine::ImplDraw( bool bLayout )
+void FixedLine::ImplDraw(vcl::RenderContext& /*rRenderContext*/, bool bLayout)
{
Size aOutSize = GetOutputSizePixel();
OUString aText = GetText();
@@ -631,12 +631,12 @@ FixedLine::FixedLine( vcl::Window* pParent, const ResId& rResId ) :
void FixedLine::FillLayoutData() const
{
mpControlData->mpLayoutData = new vcl::ControlLayoutData();
- const_cast<FixedLine*>(this)->ImplDraw( true );
+ const_cast<FixedLine*>(this)->Invalidate();
}
-void FixedLine::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void FixedLine::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{
- ImplDraw();
+ ImplDraw(rRenderContext);
}
void FixedLine::Draw( OutputDevice*, const Point&, const Size&, sal_uLong )
@@ -770,9 +770,9 @@ void FixedBitmap::ImplDraw( OutputDevice* pDev, sal_uLong /* nDrawFlags */,
}
}
-void FixedBitmap::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void FixedBitmap::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{
- ImplDraw( this, 0, Point(), GetOutputSizePixel() );
+ ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel());
}
void FixedBitmap::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
@@ -944,9 +944,9 @@ void FixedImage::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags,
}
}
-void FixedImage::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void FixedImage::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
{
- ImplDraw( this, 0, Point(), GetOutputSizePixel() );
+ ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel());
}
Size FixedImage::GetOptimalSize() const
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 77cd1a6..e6b0b9a 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.cxx
@@ -188,9 +188,9 @@ void GroupBox::FillLayoutData() const
const_cast<GroupBox*>(this)-> ImplDraw( const_cast<GroupBox*>(this), 0, Point(), GetOutputSizePixel(), true );
}
-void GroupBox::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& )
+void GroupBox::Paint( vcl::RenderContext& rRenderContext, const Rectangle& )
{
- ImplDraw( this, 0, Point(), GetOutputSizePixel() );
+ ImplDraw(&rRenderContext, 0, Point(), GetOutputSizePixel());
}
void GroupBox::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize,
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 288cb04..baaaa20 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.cxx
@@ -131,9 +131,9 @@ void ImageControl::ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Poi
} // switch ( mnScaleMode )
}
-void ImageControl::Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle& /*rRect*/ )
+void ImageControl::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/)
{
- ImplDraw( *this, 0, Point(), GetOutputSizePixel() );
+ ImplDraw(rRenderContext, 0, Point(), GetOutputSizePixel());
if( HasFocus() )
{
More information about the Libreoffice-commits
mailing list