diff options
author | Jan Holesovsky <kendy@collabora.com> | 2015-06-23 10:29:48 +0200 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:51:38 +0200 |
commit | d6615bd592bdfe2095aca77e4d38b2cd6fdd1b0b (patch) | |
tree | 08f84f3e6daaf33626c34989bd06caea376377d2 /cui | |
parent | d672048a4b622ef6f19f6ed02e512dfe3b99cdd3 (diff) |
rendercontext: Mass fix of using the wrong size.
In the paints, we must use the size of the Window for the computations, not of
the RenderContext - the RenderContext can be much bigger than the Window in
the double-buffering case.
Fixes for example the list boxes, and many others.
Change-Id: I4c7607569f88b2d097587140858d0862e54b5ea6
Reviewed-on: https://gerrit.libreoffice.org/16421
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/about.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/colorpicker.cxx | 2 | ||||
-rw-r--r-- | cui/source/dialogs/cuicharmap.cxx | 4 | ||||
-rw-r--r-- | cui/source/dialogs/cuigrfflt.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/backgrnd.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/grfpage.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numfmt.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/numpages.cxx | 2 | ||||
-rw-r--r-- | cui/source/tabpages/tabstpge.cxx | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index 7d2affb5d5b3..630dd30e9725 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -227,7 +227,7 @@ void AboutDialog::Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRe { rRenderContext.SetClipRegion(vcl::Region(rRect)); - Size aSize(rRenderContext.GetOutputSizePixel()); + Size aSize(GetOutputSizePixel()); Point aPos(aSize.Width() - aBackgroundBitmap.GetSizePixel().Width(), aSize.Height() - aBackgroundBitmap.GetSizePixel().Height()); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index 755c4aa66c9e..0eb56724958c 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -927,7 +927,7 @@ void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const Rectang if (!mpBitmap) UpdateBitmap(); - const Size aSize(rRenderContext.GetOutputSizePixel()); + const Size aSize(GetOutputSizePixel()); Bitmap aOutputBitmap(*mpBitmap); diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx index 89f63ef853c0..161301e64399 100644 --- a/cui/source/dialogs/cuicharmap.cxx +++ b/cui/source/dialogs/cuicharmap.cxx @@ -193,10 +193,10 @@ void SvxShowText::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) rRenderContext.SetTextColor(aWindowTextColor); const OUString aText = GetText(); - const Size aSize = rRenderContext.GetOutputSizePixel(); + const Size aSize(GetOutputSizePixel()); long nAvailWidth = aSize.Width(); - long nWinHeight = rRenderContext.GetOutputSizePixel().Height(); + long nWinHeight = GetOutputSizePixel().Height(); bool bGotBoundary = true; bool bShrankFont = false; diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index 59e8fd2ccb37..89794f778709 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -57,7 +57,7 @@ void GraphicPreviewWindow::Paint(vcl::RenderContext& rRenderContext, const Recta { Control::Paint(rRenderContext, rRect); - const Size aOutputSize(rRenderContext.GetOutputSizePixel()); + const Size aOutputSize(GetOutputSizePixel()); if (maPreview.IsAnimated()) { diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 2e7e2b4e9baf..dde5853986f6 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -331,7 +331,7 @@ void BackgroundPreviewImpl::Paint(vcl::RenderContext& rRenderContext, const Rect rRenderContext.DrawBitmap(aDrawPos, aDrawSize, *pBitmap); else { - Size aSize = rRenderContext.GetOutputSizePixel(); + Size aSize(GetOutputSizePixel()); rRenderContext.DrawLine(Point(0, 0), Point(aSize.Width(), aSize.Height())); rRenderContext.DrawLine(Point(0, aSize.Height()), Point(aSize.Width(), 0)); } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 7d24012235e3..538fa48836ac 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -800,7 +800,7 @@ VCL_BUILDER_DECL_FACTORY(SvxCropExample) void SvxCropExample::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { - Size aWinSize(rRenderContext.PixelToLogic(rRenderContext.GetOutputSizePixel())); + Size aWinSize(rRenderContext.PixelToLogic(GetOutputSizePixel())); rRenderContext.SetLineColor(); rRenderContext.SetFillColor(rRenderContext.GetSettings().GetStyleSettings().GetWindowColor()); rRenderContext.SetRasterOp(ROP_OVERPAINT); diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 54bcb270b116..197ca95d3dfa 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -148,7 +148,7 @@ void SvxNumberPreview::NotifyChange( const OUString& rPrevStr, void SvxNumberPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { vcl::Font aDrawFont = rRenderContext.GetFont(); - Size aSzWnd = rRenderContext.GetOutputSizePixel(); + Size aSzWnd(GetOutputSizePixel()); OUString aTmpStr( aPrevStr ); long nLeadSpace = (aSzWnd.Width() - rRenderContext.GetTextWidth(aTmpStr)) / 2; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 4d721afaffa0..33366446ab31 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2479,7 +2479,7 @@ VCL_BUILDER_FACTORY_ARGS(SvxNumberingPreview, WB_BORDER) // paint preview of numeration void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const Rectangle& /*rRect*/) { - Size aSize(rRenderContext.PixelToLogic(rRenderContext.GetOutputSizePixel())); + Size aSize(rRenderContext.PixelToLogic(GetOutputSizePixel())); const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); const Color aBackColor = rStyleSettings.GetFieldColor(); diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 87c493b43901..eb0ab81702e0 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -83,7 +83,7 @@ void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) { // Paint tabulators Point aPoint; - Size aSize = rRenderContext.GetOutputSizePixel(); + Size aSize(GetOutputSizePixel()); aPoint.X() = aSize.Width() / 2; aPoint.Y() = aSize.Height() / 2; Ruler::DrawTab(rRenderContext, rRenderContext.GetSettings().GetStyleSettings().GetFontColor(), aPoint, nTabStyle); |