[Libreoffice-commits] core.git: cui/source
Noel Grandin
noel.grandin at collabora.co.uk
Thu Feb 8 20:22:54 UTC 2018
cui/source/dialogs/colorpicker.cxx | 135 ++++++++++++++++---------------------
1 file changed, 59 insertions(+), 76 deletions(-)
New commits:
commit 7116b9cc2f3ee28b4444540d0c14183b9bd17968
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Thu Feb 8 17:03:10 2018 +0200
replace Bitmap usage with VirtualDevice in ColorSliderControl
So we can move more Bitmap*Access stuff inside vcl/.
Change-Id: I3520f61483f84ac30ffd9059ed4112c9c074f195
Reviewed-on: https://gerrit.libreoffice.org/49405
Reviewed-by: Michael Meeks <michael.meeks at collabora.com>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index d6e0269b39b4..e049d7283b44 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -37,6 +37,7 @@
#include <vcl/decoview.hxx>
#include <vcl/svapp.hxx>
#include <vcl/builderfactory.hxx>
+#include <vcl/virdev.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
@@ -625,7 +626,7 @@ private:
Link<ColorSliderControl&,void> maModifyHdl;
Color maColor;
ColorMode meMode;
- Bitmap* mpBitmap;
+ VclPtr<VirtualDevice> mxBitmap;
sal_Int16 mnLevel;
double mdValue;
};
@@ -633,7 +634,6 @@ private:
ColorSliderControl::ColorSliderControl( vcl::Window* pParent, WinBits nStyle )
: Control( pParent, nStyle )
, meMode( DefaultMode )
- , mpBitmap( nullptr )
, mnLevel( 0 )
, mdValue( -1.0 )
{
@@ -647,8 +647,7 @@ ColorSliderControl::~ColorSliderControl()
void ColorSliderControl::dispose()
{
- delete mpBitmap;
- mpBitmap = nullptr;
+ mxBitmap.disposeAndClear();
Control::dispose();
}
@@ -658,84 +657,73 @@ void ColorSliderControl::UpdateBitmap()
{
Size aSize(1, GetOutputSizePixel().Height());
- if (mpBitmap && mpBitmap->GetSizePixel() != aSize)
- {
- delete mpBitmap;
- mpBitmap = nullptr;
- }
-
- if (!mpBitmap)
- mpBitmap = new Bitmap(aSize, 24);
+ if (mxBitmap && mxBitmap->GetOutputSizePixel() == aSize)
+ return;
- BitmapWriteAccess* pWriteAccess = mpBitmap->AcquireWriteAccess();
+ mxBitmap.disposeAndClear();
+ mxBitmap->SetOutputSizePixel(aSize);
- if (pWriteAccess)
- {
- const long nY = aSize.Height() - 1;
+ const long nY = aSize.Height() - 1;
- BitmapColor aBitmapColor(maColor);
+ Color aBitmapColor(maColor);
- sal_uInt16 nHue, nSat, nBri;
- maColor.RGBtoHSB(nHue, nSat, nBri);
+ sal_uInt16 nHue, nSat, nBri;
+ maColor.RGBtoHSB(nHue, nSat, nBri);
- // this has been unlooped for performance reason, please do not merge back!
+ // this has been unlooped for performance reason, please do not merge back!
- switch (meMode)
+ switch (meMode)
+ {
+ case HUE:
+ nSat = 100;
+ nBri = 100;
+ for (long y = 0; y <= nY; y++)
{
- case HUE:
- nSat = 100;
- nBri = 100;
- for (long y = 0; y <= nY; y++)
- {
- nHue = static_cast<sal_uInt16>((359 * y) / nY);
- aBitmapColor = BitmapColor(Color(Color::HSBtoRGB(nHue, nSat, nBri)));
- pWriteAccess->SetPixel(nY - y, 0, aBitmapColor);
- }
- break;
-
- case SATURATION:
- nBri = std::max(sal_uInt16(32), nBri);
- for (long y = 0; y <= nY; y++)
- {
- nSat = static_cast<sal_uInt16>((100 * y) / nY);
- pWriteAccess->SetPixel(nY - y, 0, BitmapColor(Color(Color::HSBtoRGB(nHue, nSat, nBri))));
- }
- break;
+ nHue = static_cast<sal_uInt16>((359 * y) / nY);
+ mxBitmap->DrawPixel(Point(0, nY - y), Color(Color::HSBtoRGB(nHue, nSat, nBri)));
+ }
+ break;
- case BRIGHTNESS:
- for (long y = 0; y <= nY; y++)
- {
- nBri = static_cast<sal_uInt16>((100 * y) / nY);
- pWriteAccess->SetPixel(nY - y, 0, BitmapColor(Color(Color::HSBtoRGB(nHue, nSat, nBri))));
- }
- break;
+ case SATURATION:
+ nBri = std::max(sal_uInt16(32), nBri);
+ for (long y = 0; y <= nY; y++)
+ {
+ nSat = static_cast<sal_uInt16>((100 * y) / nY);
+ mxBitmap->DrawPixel(Point(0, nY - y), Color(Color::HSBtoRGB(nHue, nSat, nBri)));
+ }
+ break;
- case RED:
- for (long y = 0; y <= nY; y++)
- {
- aBitmapColor.SetRed(sal_uInt8((long(255) * y) / nY));
- pWriteAccess->SetPixel(nY - y, 0, aBitmapColor);
- }
- break;
+ case BRIGHTNESS:
+ for (long y = 0; y <= nY; y++)
+ {
+ nBri = static_cast<sal_uInt16>((100 * y) / nY);
+ mxBitmap->DrawPixel(Point(0, nY - y), Color(Color::HSBtoRGB(nHue, nSat, nBri)));
+ }
+ break;
- case GREEN:
- for (long y = 0; y <= nY; y++)
- {
- aBitmapColor.SetGreen(sal_uInt8((long(255) * y) / nY));
- pWriteAccess->SetPixel(nY - y, 0, aBitmapColor);
- }
- break;
+ case RED:
+ for (long y = 0; y <= nY; y++)
+ {
+ aBitmapColor.SetRed(sal_uInt8((long(255) * y) / nY));
+ mxBitmap->DrawPixel(Point(0, nY - y), aBitmapColor);
+ }
+ break;
- case BLUE:
- for (long y = 0; y <= nY; y++)
- {
- aBitmapColor.SetBlue(sal_uInt8((long(255) * y) / nY));
- pWriteAccess->SetPixel(nY - y, 0, aBitmapColor);
- }
- break;
+ case GREEN:
+ for (long y = 0; y <= nY; y++)
+ {
+ aBitmapColor.SetGreen(sal_uInt8((long(255) * y) / nY));
+ mxBitmap->DrawPixel(Point(0, nY - y), aBitmapColor);
}
+ break;
- Bitmap::ReleaseAccess(pWriteAccess);
+ case BLUE:
+ for (long y = 0; y <= nY; y++)
+ {
+ aBitmapColor.SetBlue(sal_uInt8((long(255) * y) / nY));
+ mxBitmap->DrawPixel(Point(0, nY - y), aBitmapColor);
+ }
+ break;
}
}
@@ -803,21 +791,16 @@ void ColorSliderControl::KeyInput(const KeyEvent& rKEvt)
void ColorSliderControl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Rectangle& /*rRect*/)
{
- if (!mpBitmap)
+ if (!mxBitmap)
UpdateBitmap();
const Size aSize(GetOutputSizePixel());
- Bitmap aOutputBitmap(*mpBitmap);
-
- if (GetBitCount() <= 8)
- aOutputBitmap.Dither();
-
Point aPos;
int x = aSize.Width();
while (x--)
{
- rRenderContext.DrawBitmap(aPos, aOutputBitmap);
+ rRenderContext.DrawOutDev(aPos, aSize, Point(0,0), aSize, *mxBitmap);
aPos.X() += 1;
}
}
More information about the Libreoffice-commits
mailing list