[Libreoffice-commits] core.git: 5 commits - icon-themes/elementary icon-themes/galaxy include/vcl svx/source vcl/source
Caolán McNamara
caolanm at redhat.com
Wed Jan 4 20:35:27 UTC 2017
dev/null |binary
icon-themes/elementary/vcl/res/check.png |binary
icon-themes/elementary/vcl/res/checkmono.png |binary
icon-themes/elementary/vcl/res/radio.png |binary
icon-themes/elementary/vcl/res/radiomono.png |binary
icon-themes/galaxy/vcl/res/check.png |binary
icon-themes/galaxy/vcl/res/checkmono.png |binary
icon-themes/galaxy/vcl/res/radio.png |binary
icon-themes/galaxy/vcl/res/radiomono.png |binary
include/vcl/image.hxx | 9 +--
include/vcl/splitwin.hxx | 1
svx/source/dialog/frmsel.cxx | 2
vcl/source/control/button.cxx | 3 -
vcl/source/image/ImageList.cxx | 9 ---
vcl/source/src/images.src | 4 -
vcl/source/window/splitwin.cxx | 66 ---------------------------
16 files changed, 9 insertions(+), 85 deletions(-)
New commits:
commit 59ad262ab97c497c3e8a24d2e4a65b38f1d1dbec
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 4 18:47:55 2017 +0000
last bitmaps that pMaskColor arg was used on converted to true transparency
Change-Id: I99bb32355bc53e2c870f84e60fc1e35b9dfe8270
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index f2aceb4..d086c3e 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -82,7 +82,6 @@ public:
const std::vector< OUString > &rNameVector );
void InsertFromHorizontalBitmap(const ResId& rResId,
sal_uInt16 nCount,
- const Color *pNonAlphaMaskColor,
const Color *pSearchColors,
const Color *pReplaceColors,
sal_uLong nColorCount);
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index a459bf4..1f045ba 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -321,7 +321,7 @@ void FrameSelectorImpl::InitArrowImageList()
GetRes( SVX_RES( RID_SVXSTR_BORDER_CONTROL ).SetRT( RSC_RESOURCE ) );
maILArrows.InsertFromHorizontalBitmap(
- SVX_RES( BMP_FRMSEL_ARROWS ), 16, nullptr, pColorAry1, pColorAry2, 3);
+ SVX_RES( BMP_FRMSEL_ARROWS ), 16, pColorAry1, pColorAry2, 3);
FreeResource();
DBG_ASSERT( maILArrows.GetImageSize().Height() == maILArrows.GetImageSize().Width(),
"svx::FrameSelectorImpl::InitArrowImageList - images are not squarish" );
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 6eceff6..d88ad04 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -2764,10 +2764,9 @@ static void LoadThemedImageList (const StyleSettings &rStyleSettings,
aColorAry2[4] = rStyleSettings.GetDarkShadowColor();
aColorAry2[5] = rStyleSettings.GetWindowTextColor();
- Color aMaskColor(0x00, 0x00, 0xFF );
static_assert( sizeof(aColorAry1) == sizeof(aColorAry2), "aColorAry1 must match aColorAry2" );
// FIXME: do we want the mask for the checkbox ?
- pList->InsertFromHorizontalBitmap (rResId, nImages, &aMaskColor,
+ pList->InsertFromHorizontalBitmap (rResId, nImages,
aColorAry1, aColorAry2, SAL_N_ELEMENTS(aColorAry1));
}
diff --git a/vcl/source/image/ImageList.cxx b/vcl/source/image/ImageList.cxx
index 748e19d..e9b8c33 100644
--- a/vcl/source/image/ImageList.cxx
+++ b/vcl/source/image/ImageList.cxx
@@ -120,19 +120,12 @@ void ImageList::InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
void ImageList::InsertFromHorizontalBitmap( const ResId& rResId,
sal_uInt16 nCount,
- const Color *pMaskColor,
const Color *pSearchColors,
const Color *pReplaceColors,
sal_uLong nColorCount)
{
BitmapEx aBmpEx( rResId );
- if (!aBmpEx.IsTransparent())
- {
- if( pMaskColor )
- aBmpEx = BitmapEx( aBmpEx.GetBitmap(), *pMaskColor );
- else
- aBmpEx = BitmapEx( aBmpEx.GetBitmap() );
- }
+
if ( nColorCount && pSearchColors && pReplaceColors )
aBmpEx.Replace( pSearchColors, pReplaceColors, nColorCount );
commit f1a8e00764b32c3b799ecd40dcb4dd632493bc45
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 4 18:39:34 2017 +0000
replace the blue which will be set to transparent, with transparent
Change-Id: I95923685d412145e88b672a50311c767d1425493
diff --git a/icon-themes/elementary/vcl/res/check.png b/icon-themes/elementary/vcl/res/check.png
index daeddd2..05f8b1c 100644
Binary files a/icon-themes/elementary/vcl/res/check.png and b/icon-themes/elementary/vcl/res/check.png differ
diff --git a/icon-themes/elementary/vcl/res/checkmono.png b/icon-themes/elementary/vcl/res/checkmono.png
index 69c8913..dc8888e 100644
Binary files a/icon-themes/elementary/vcl/res/checkmono.png and b/icon-themes/elementary/vcl/res/checkmono.png differ
diff --git a/icon-themes/elementary/vcl/res/radio.png b/icon-themes/elementary/vcl/res/radio.png
index 73e2a04..dff0839 100644
Binary files a/icon-themes/elementary/vcl/res/radio.png and b/icon-themes/elementary/vcl/res/radio.png differ
diff --git a/icon-themes/elementary/vcl/res/radiomono.png b/icon-themes/elementary/vcl/res/radiomono.png
index d9e4471..cdee168 100644
Binary files a/icon-themes/elementary/vcl/res/radiomono.png and b/icon-themes/elementary/vcl/res/radiomono.png differ
diff --git a/icon-themes/galaxy/vcl/res/check.png b/icon-themes/galaxy/vcl/res/check.png
index 3bf35b2..05f8b1c 100644
Binary files a/icon-themes/galaxy/vcl/res/check.png and b/icon-themes/galaxy/vcl/res/check.png differ
diff --git a/icon-themes/galaxy/vcl/res/checkmono.png b/icon-themes/galaxy/vcl/res/checkmono.png
index 4cabe128..afdf871 100644
Binary files a/icon-themes/galaxy/vcl/res/checkmono.png and b/icon-themes/galaxy/vcl/res/checkmono.png differ
diff --git a/icon-themes/galaxy/vcl/res/radio.png b/icon-themes/galaxy/vcl/res/radio.png
index c198a6d..dff0839 100644
Binary files a/icon-themes/galaxy/vcl/res/radio.png and b/icon-themes/galaxy/vcl/res/radio.png differ
diff --git a/icon-themes/galaxy/vcl/res/radiomono.png b/icon-themes/galaxy/vcl/res/radiomono.png
index aba237e..88f1014 100644
Binary files a/icon-themes/galaxy/vcl/res/radiomono.png and b/icon-themes/galaxy/vcl/res/radiomono.png differ
commit a3c4f39868226151b4b01906cbcf1b6d40740a28
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 4 18:33:36 2017 +0000
convert these mono versions to png
Change-Id: I93755ac95c170c457b32adac07557ed48ad8beee
diff --git a/icon-themes/elementary/vcl/res/checkmono.bmp b/icon-themes/elementary/vcl/res/checkmono.bmp
deleted file mode 100644
index 7e0610d..0000000
Binary files a/icon-themes/elementary/vcl/res/checkmono.bmp and /dev/null differ
diff --git a/icon-themes/elementary/vcl/res/checkmono.png b/icon-themes/elementary/vcl/res/checkmono.png
new file mode 100644
index 0000000..69c8913
Binary files /dev/null and b/icon-themes/elementary/vcl/res/checkmono.png differ
diff --git a/icon-themes/elementary/vcl/res/radiomono.bmp b/icon-themes/elementary/vcl/res/radiomono.bmp
deleted file mode 100644
index 6c757c3..0000000
Binary files a/icon-themes/elementary/vcl/res/radiomono.bmp and /dev/null differ
diff --git a/icon-themes/elementary/vcl/res/radiomono.png b/icon-themes/elementary/vcl/res/radiomono.png
new file mode 100644
index 0000000..d9e4471
Binary files /dev/null and b/icon-themes/elementary/vcl/res/radiomono.png differ
diff --git a/icon-themes/galaxy/vcl/res/checkmono.bmp b/icon-themes/galaxy/vcl/res/checkmono.bmp
deleted file mode 100644
index 7e0610d..0000000
Binary files a/icon-themes/galaxy/vcl/res/checkmono.bmp and /dev/null differ
diff --git a/icon-themes/galaxy/vcl/res/checkmono.png b/icon-themes/galaxy/vcl/res/checkmono.png
new file mode 100644
index 0000000..4cabe128
Binary files /dev/null and b/icon-themes/galaxy/vcl/res/checkmono.png differ
diff --git a/icon-themes/galaxy/vcl/res/radiomono.bmp b/icon-themes/galaxy/vcl/res/radiomono.bmp
deleted file mode 100644
index 6c757c3..0000000
Binary files a/icon-themes/galaxy/vcl/res/radiomono.bmp and /dev/null differ
diff --git a/icon-themes/galaxy/vcl/res/radiomono.png b/icon-themes/galaxy/vcl/res/radiomono.png
new file mode 100644
index 0000000..aba237e
Binary files /dev/null and b/icon-themes/galaxy/vcl/res/radiomono.png differ
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index c6eaeef..5417e53 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -26,7 +26,7 @@ Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_STDOFFSET)
Bitmap (SV_RESID_BITMAP_CHECK + SV_RESID_MONOOFFSET)
{
- File = "checkmono.bmp";
+ File = "checkmono.png";
};
Bitmap (SV_RESID_BITMAP_SCROLLVH)
@@ -71,7 +71,7 @@ Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_STDOFFSET)
Bitmap (SV_RESID_BITMAP_RADIO + SV_RESID_MONOOFFSET)
{
- File = "radiomono.bmp";
+ File = "radiomono.png";
};
Bitmap SV_RESID_BITMAP_ERRORBOX
commit 4d1cbb7e894bba9769789a89a90622944fd28c80
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 4 16:58:41 2017 +0000
drop unused SplitWindow::ImplDrawButtonRect
Change-Id: I0ccb4adfec39f8717d5921e04809af65be066d0a
diff --git a/include/vcl/splitwin.hxx b/include/vcl/splitwin.hxx
index 045eb27..9f81d7f 100644
--- a/include/vcl/splitwin.hxx
+++ b/include/vcl/splitwin.hxx
@@ -92,7 +92,6 @@ private:
SAL_DLLPRIVATE void ImplGetButtonRect( Rectangle& rRect, long nEx, bool bTest ) const;
SAL_DLLPRIVATE void ImplGetFadeInRect( Rectangle& rRect, bool bTest = false ) const;
SAL_DLLPRIVATE void ImplGetFadeOutRect( Rectangle& rRect, bool bTest = false ) const;
- SAL_DLLPRIVATE void ImplDrawButtonRect(vcl::RenderContext& rRenderContext, const Rectangle& rRect, long nSize);
SAL_DLLPRIVATE void ImplDrawFadeIn(vcl::RenderContext& rRenderContext);
SAL_DLLPRIVATE void ImplDrawFadeOut(vcl::RenderContext& rRenderContext);
SAL_DLLPRIVATE void ImplNewAlign();
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 0f3df6a..2105a60 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -1704,72 +1704,6 @@ void SplitWindow::ImplGetFadeOutRect( Rectangle& rRect, bool ) const
rRect = aRect;
}
-void SplitWindow::ImplDrawButtonRect(vcl::RenderContext& rRenderContext, const Rectangle& rRect, long nSize)
-{
- const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
-
- if ( mbHorz )
- {
- long nLeft = rRect.Left();
- long nRight = rRect.Right();
- long nCenter = rRect.Center().Y();
- long nEx1 = nLeft+((rRect.GetWidth()-nSize)/2)-2;
- long nEx2 = nEx1+nSize+3;
- rRenderContext.SetLineColor( rStyleSettings.GetLightColor() );
- rRenderContext.DrawLine( Point( rRect.Left(), rRect.Top() ), Point( rRect.Left(), rRect.Bottom() ) );
- rRenderContext.DrawLine( Point( rRect.Left(), rRect.Top() ), Point( rRect.Right(), rRect.Top() ) );
- rRenderContext.SetLineColor( rStyleSettings.GetShadowColor() );
- rRenderContext.DrawLine( Point( rRect.Right(), rRect.Top() ), Point( rRect.Right(), rRect.Bottom() ) );
- rRenderContext.DrawLine( Point( rRect.Left(), rRect.Bottom() ), Point( rRect.Right(), rRect.Bottom() ) );
- long i = nLeft+2;
- while ( i < nRight-3 )
- {
- if ( (i < nEx1) || (i > nEx2 ) )
- {
- rRenderContext.DrawPixel( Point( i, nCenter-2 ), rStyleSettings.GetLightColor() );
- rRenderContext.DrawPixel( Point( i+1, nCenter-2+1 ), rStyleSettings.GetShadowColor() );
- }
- i++;
- if ( (i < nEx1) || ((i > nEx2 ) && (i < nRight-3)) )
- {
- rRenderContext.DrawPixel( Point( i, nCenter+2 ), rStyleSettings.GetLightColor() );
- rRenderContext.DrawPixel( Point( i+1, nCenter+2+1 ), rStyleSettings.GetShadowColor() );
- }
- i += 2;
- }
- }
- else
- {
- long nTop = rRect.Top();
- long nBottom = rRect.Bottom();
- long nCenter = rRect.Center().X();
- long nEx1 = nTop+((rRect.GetHeight()-nSize)/2)-2;
- long nEx2 = nEx1+nSize+3;
- rRenderContext.SetLineColor( rStyleSettings.GetLightColor() );
- rRenderContext.DrawLine( Point( rRect.Left(), rRect.Top() ), Point( rRect.Right(), rRect.Top() ) );
- rRenderContext.DrawLine( Point( rRect.Left(), rRect.Top() ), Point( rRect.Left(), rRect.Bottom() ) );
- rRenderContext.SetLineColor( rStyleSettings.GetShadowColor() );
- rRenderContext.DrawLine( Point( rRect.Right(), rRect.Top() ), Point( rRect.Right(), rRect.Bottom() ) );
- rRenderContext.DrawLine( Point( rRect.Left(), rRect.Bottom() ), Point( rRect.Right(), rRect.Bottom() ) );
- long i = nTop+2;
- while ( i < nBottom-3 )
- {
- if ( (i < nEx1) || (i > nEx2 ) )
- {
- rRenderContext.DrawPixel( Point( nCenter-2, i ), rStyleSettings.GetLightColor() );
- rRenderContext.DrawPixel( Point( nCenter-2+1, i+1 ), rStyleSettings.GetShadowColor() );
- }
- i++;
- if ( (i < nEx1) || ((i > nEx2 ) && (i < nBottom-3)) )
- {
- rRenderContext.DrawPixel( Point( nCenter+2, i ), rStyleSettings.GetLightColor() );
- rRenderContext.DrawPixel( Point( nCenter+2+1, i+1 ), rStyleSettings.GetShadowColor() );
- }
- i += 2;
- }
- }
-}
-
void SplitWindow::ImplDrawGrip(vcl::RenderContext& rRenderContext, const Rectangle& rRect, bool bHorizontal, bool bLeft)
{
const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings();
commit 8077cc31a00ea32272102641f5814bba6098144b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Jan 4 16:56:29 2017 +0000
all users of InsertFromHorizontalBitmap use all args
Change-Id: I458036b084645af509d64a78f5389415dfc4115a
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index f6ed44a..f2aceb4 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -80,12 +80,12 @@ public:
void InsertFromHorizontalStrip( const BitmapEx &rBitmapEx,
const std::vector< OUString > &rNameVector );
- void InsertFromHorizontalBitmap( const ResId& rResId,
+ void InsertFromHorizontalBitmap(const ResId& rResId,
sal_uInt16 nCount,
const Color *pNonAlphaMaskColor,
- const Color *pSearchColors = nullptr,
- const Color *pReplaceColors = nullptr,
- sal_uLong nColorCount = 0);
+ const Color *pSearchColors,
+ const Color *pReplaceColors,
+ sal_uLong nColorCount);
BitmapEx GetAsHorizontalStrip() const;
sal_uInt16 GetImageCount() const;
Size GetImageSize() const;
More information about the Libreoffice-commits
mailing list