diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-08-16 14:56:54 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-16 17:42:41 +0200 |
commit | a94f95d173e531fe7df0e8caebd6763253798b39 (patch) | |
tree | 0ea825a86c4a2cbbf54c45d8498b4e6424e0eaa5 /cui | |
parent | fe70fa98ef53e5dc054d86c7cb857e41d6c3e6d6 (diff) |
tdf#126254 Help - About is black with Linux gen and gtk2
Change-Id: If18693e1cb8a92a7a152dd9decc892fc5f2b7ab5
Reviewed-on: https://gerrit.libreoffice.org/77591
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/about.cxx | 12 | ||||
-rw-r--r-- | cui/uiconfig/ui/aboutdialog.ui | 1 |
2 files changed, 5 insertions, 8 deletions
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index a10fd4ecba9b..a9617f7a8381 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -178,10 +178,8 @@ void AboutDialog::SetLogo() m_xDialog->set_logo(nullptr); else { - ScopedVclPtr<VirtualDevice> xDevice(m_xDialog->create_virtual_device()); - xDevice->SetOutputSize(aLogoBitmap.GetSizePixel()); - xDevice->DrawBitmapEx(Point(), aLogoBitmap); - m_xDialog->set_logo(xDevice.get()); + Graphic aGraphic(aLogoBitmap); + m_xDialog->set_logo(aGraphic.GetXGraphic()); } } @@ -193,10 +191,8 @@ IMPL_LINK(AboutDialog, SizeAllocHdl, const Size&, rSize, void) if (!(Application::GetSettings().GetStyleSettings().GetHighContrastMode())) { SfxApplication::loadBrandSvg("shell/about", aBackgroundBitmap, rSize.Width()); - ScopedVclPtr<VirtualDevice> xDevice(m_xDialog->create_virtual_device()); - xDevice->SetOutputSize(aBackgroundBitmap.GetSizePixel()); - xDevice->DrawBitmapEx(Point(), aBackgroundBitmap); - m_xDialog->set_background(xDevice.get()); + Graphic aGraphic(aBackgroundBitmap); + m_xDialog->set_background(aGraphic.GetXGraphic()); } } diff --git a/cui/uiconfig/ui/aboutdialog.ui b/cui/uiconfig/ui/aboutdialog.ui index 07f2be7e3e06..b2ad949019c8 100644 --- a/cui/uiconfig/ui/aboutdialog.ui +++ b/cui/uiconfig/ui/aboutdialog.ui @@ -9,6 +9,7 @@ <property name="default_height">0</property> <property name="type_hint">dialog</property> <property name="title" translatable="yes" context="aboutdialog|AboutDialog">About %PRODUCTNAME</property> + <property name="resizable">False</property> <property name="program_name">%PRODUCTNAME</property> <property name="comments" translatable="yes" context="aboutdialog|description">%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more.</property> <property name="website">https://www.libreoffice.org/</property> |