Kaydet (Commit) 813b11a9 authored tarafından Aybuke Ozdemir's avatar Aybuke Ozdemir Kaydeden (comit) Katarina Behrens

tdf#88548 fontwork gallery always have transparent/checkered background.

Change-Id: I8995ef12edb64c14788ba3a2c3c1c2ceb3775b11
(cherry picked from commit 9b322ace)
Reviewed-on: https://gerrit.libreoffice.org/19642Reviewed-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
Tested-by: 's avatarKatarina Behrens <Katarina.Behrens@cib.de>
üst 53b8f63d
...@@ -6405,7 +6405,7 @@ ...@@ -6405,7 +6405,7 @@
</desc> </desc>
<label>Shows previews with shining through checkered background to visualize transparency.</label> <label>Shows previews with shining through checkered background to visualize transparency.</label>
</info> </info>
<value>true</value> <value>false</value>
</prop> </prop>
</group> </group>
<group oor:name="ExternalApps" oor:extensible="true"> <group oor:name="ExternalApps" oor:extensible="true">
......
...@@ -257,23 +257,13 @@ void GalleryPreview::PreviewMedia( const INetURLObject& rURL ) ...@@ -257,23 +257,13 @@ void GalleryPreview::PreviewMedia( const INetURLObject& rURL )
void drawTransparenceBackground(vcl::RenderContext& rOut, const Point& rPos, const Size& rSize) void drawTransparenceBackground(vcl::RenderContext& rOut, const Point& rPos, const Size& rSize)
{ {
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
if (rStyleSettings.GetPreviewUsesCheckeredBackground())
{
// draw checkered background // draw checkered background
static const sal_uInt32 nLen(8); static const sal_uInt32 nLen(8);
static const Color aW(COL_WHITE); static const Color aW(COL_WHITE);
static const Color aG(0xef, 0xef, 0xef); static const Color aG(0xef, 0xef, 0xef);
rOut.DrawCheckered(rPos, rSize, nLen, aW, aG); rOut.DrawCheckered(rPos, rSize, nLen, aW, aG);
}
else
{
rOut.SetLineColor();
rOut.SetFillColor(rStyleSettings.GetFieldColor());
rOut.DrawRect(Rectangle(rPos, rSize));
}
} }
GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) : GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) :
......
...@@ -116,7 +116,6 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId) ...@@ -116,7 +116,6 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId)
sal_uInt32 nModelPos; sal_uInt32 nModelPos;
FmFormModel *pModel = NULL; FmFormModel *pModel = NULL;
const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings();
for( nModelPos = 0; nModelPos < nFavCount; nModelPos++ ) for( nModelPos = 0; nModelPos < nFavCount; nModelPos++ )
{ {
...@@ -134,19 +133,11 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId) ...@@ -134,19 +133,11 @@ void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId)
pVDev->SetOutputSizePixel(aSize); pVDev->SetOutputSizePixel(aSize);
if(rStyleSettings.GetPreviewUsesCheckeredBackground())
{
static const sal_uInt32 nLen(8); static const sal_uInt32 nLen(8);
static const Color aW(COL_WHITE); static const Color aW(COL_WHITE);
static const Color aG(0xef, 0xef, 0xef); static const Color aG(0xef, 0xef, 0xef);
pVDev->DrawCheckered(aNull, aSize, nLen, aW, aG); pVDev->DrawCheckered(aNull, aSize, nLen, aW, aG);
}
else
{
pVDev->SetBackground(rStyleSettings.GetFieldColor());
pVDev->Erase();
}
pVDev->DrawBitmapEx(aNull, aThumb); pVDev->DrawBitmapEx(aNull, aThumb);
maFavoritesHorizontal.push_back(pVDev->GetBitmap(aNull, aSize)); maFavoritesHorizontal.push_back(pVDev->GetBitmap(aNull, aSize));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment