diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2016-12-22 22:28:23 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-12-23 22:03:34 +0000 |
| commit | 96b95f5010be090ebae6f755d4d3891a2334332c (patch) | |
| tree | aa99215a87430cf32760376e2f6b12e7ee9b89a4 /vcl/unx | |
| parent | 995dca083778c9bd76f34f48134bb347f99de9b2 (diff) | |
tdf#103626 don't scale application icon to prevent a start-up loop
Change-Id: I2e65ba16d93167dc4abb029c7e941e91be9a62ab
Reviewed-on: https://gerrit.libreoffice.org/32382
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/window/salframe.cxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx index ba4c190e5f36..ffbccc75ef30 100644 --- a/vcl/unx/generic/window/salframe.cxx +++ b/vcl/unx/generic/window/salframe.cxx @@ -35,6 +35,7 @@ #include <vcl/settings.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/opengl/OpenGLContext.hxx> +#include <vcl/BitmapTools.hxx> #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -209,7 +210,10 @@ static void CreateNetWmAppIcon( sal_uInt16 nIcon, NetWmIconData& netwm_icon ) nIconSizeOffset = SV_ICON_SIZE32_START; else nIconSizeOffset = SV_ICON_SIZE16_START; - BitmapEx aIcon( ResId(nIconSizeOffset + nIcon, *ImplGetResMgr())); + + BitmapEx aIcon = vcl::bitmap::loadFromResource(ResId(nIconSizeOffset + nIcon, *ImplGetResMgr()), + ImageLoadFlags::IgnoreScalingFactor); + if( aIcon.IsEmpty()) continue; Bitmap icon = aIcon.GetBitmap(); @@ -250,7 +254,6 @@ static bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen sal_uInt16 nIcon, sal_uInt16 iconSize, Pixmap& icon_pixmap, Pixmap& icon_mask, NetWmIconData& netwm_icon) { - return true; if( ! ImplGetResMgr() ) return false; @@ -267,7 +270,9 @@ static bool lcl_SelectAppIconPixmap( SalDisplay *pDisplay, SalX11Screen nXScreen else return false; - BitmapEx aIcon( ResId(nIconSizeOffset + nIcon, *ImplGetResMgr())); + BitmapEx aIcon = vcl::bitmap::loadFromResource(ResId(nIconSizeOffset + nIcon, *ImplGetResMgr()), + ImageLoadFlags::IgnoreScalingFactor); + if( aIcon.IsEmpty() ) return false; |