framework/inc/classes/resource.hrc | 1 + framework/source/classes/resource.src | 5 +++++ framework/source/uielement/popuptoolbarcontroller.cxx | 8 ++++++-- icon-themes/galaxy/res/savemodified_extralarge.png |binary 4 files changed, 12 insertions(+), 2 deletions(-)
New commits: commit 98a03d9b0d13b8f811ccf8fc1a9b7f9469ed079c Author: Maxim Monastirsky <momonas...@gmail.com> Date: Mon Mar 6 00:28:09 2017 +0200 tdf#106224 Support extra large savemodified icon For now just duplicated the large icon in Galaxy, to satisfy the resource compiler. Change-Id: Icf31df0185a1ec7f080d9600b2536bcaa5d0783e diff --git a/framework/inc/classes/resource.hrc b/framework/inc/classes/resource.hrc index 83656e5..ad3d984 100644 --- a/framework/inc/classes/resource.hrc +++ b/framework/inc/classes/resource.hrc @@ -55,6 +55,7 @@ #define BMP_SAVEMODIFIED_SMALL (RID_IMAGE_START+0) #define BMP_SAVEMODIFIED_LARGE (RID_IMAGE_START+1) +#define BMP_SAVEMODIFIED_EXTRALARGE (RID_IMAGE_START+2) #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION (RID_MENU_START+0) diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 745e10e..0d3b02d 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -214,4 +214,9 @@ Bitmap BMP_SAVEMODIFIED_LARGE File = "savemodified_large.png"; }; +Bitmap BMP_SAVEMODIFIED_EXTRALARGE +{ + File = "savemodified_extralarge.png"; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 3fa27a8..74ff9da 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -507,8 +507,12 @@ void SaveToolbarController::updateImage() } else if ( m_bModified ) { - Image aResImage(BitmapEx(eImageType == vcl::ImageType::Size16 ? FwkResId(BMP_SAVEMODIFIED_SMALL) : FwkResId(BMP_SAVEMODIFIED_LARGE))); - aImage = aResImage; + if (eImageType == vcl::ImageType::Size26) + aImage = Image(BitmapEx(FwkResId(BMP_SAVEMODIFIED_LARGE))); + else if (eImageType == vcl::ImageType::Size32) + aImage = Image(BitmapEx(FwkResId(BMP_SAVEMODIFIED_EXTRALARGE))); + else + aImage = Image(BitmapEx(FwkResId(BMP_SAVEMODIFIED_SMALL))); } if ( !aImage ) diff --git a/icon-themes/galaxy/res/savemodified_extralarge.png b/icon-themes/galaxy/res/savemodified_extralarge.png new file mode 100644 index 0000000..c1052e0 Binary files /dev/null and b/icon-themes/galaxy/res/savemodified_extralarge.png differ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits