diff options
author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2016-10-30 16:24:37 +0100 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-10-30 18:00:05 +0000 |
commit | b1426b5b502fd591402d666994e3f1fb3a8ad959 (patch) | |
tree | 3614d896993b004e805f9714a126070ec5d5c29f /sfx2 | |
parent | 17b1ebbf86ceabe2e9cabf9626ca94fae3fb9216 (diff) |
tdf#95014 initial support for 32 px icons in toolbar
This adds support for 32 pixel icons - mainly to get them into
the toolbar.
Most changes made are to change the behavior of having only small
and large icons as a boolean choice, but not every code path was
converted to non-boolean choice yet.
Breeze icon theme has the 32px variants so it can be used already.
Change-Id: Iadf832a87826c16b3a83522104dd6c35d61a0f87
Reviewed-on: https://gerrit.libreoffice.org/30398
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/sidebar/SidebarToolBox.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sfx2/source/sidebar/SidebarToolBox.cxx b/sfx2/source/sidebar/SidebarToolBox.cxx index 150e9d33eaba..26a758d447f7 100644 --- a/sfx2/source/sidebar/SidebarToolBox.cxx +++ b/sfx2/source/sidebar/SidebarToolBox.cxx @@ -268,7 +268,14 @@ IMPL_LINK_NOARG(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, void) ToolBoxButtonSize eSize = GetIconSize(); - bool bBigImages(eSize == ToolBoxButtonSize::Large); + vcl::ImageType eImageType = vcl::ImageType::Size16; + if (eSize == ToolBoxButtonSize::Large) + eImageType = vcl::ImageType::Size26; + else if (eSize == ToolBoxButtonSize::Size32) + eImageType = vcl::ImageType::Size32; + + bool bBig = (eImageType == vcl::ImageType::Size26 || eImageType == vcl::ImageType::Size32); + SetToolboxButtonSize(eSize); for (auto const& it : maControllers) @@ -286,11 +293,11 @@ IMPL_LINK_NOARG(SidebarToolBox, ChangedIconSizeHandler, LinkParamNone*, void) if(SfxViewFrame::Current()) { css::uno::Reference<frame::XFrame> xFrame = SfxViewFrame::Current()->GetFrame().GetFrameInterface(); - Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aCommandURL, bBigImages, xFrame); + Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aCommandURL, xFrame, eImageType); // Try also to query for add-on images before giving up and use an // empty image. if (!aImage) - aImage = framework::AddonsOptions().GetImageFromURL(aCommandURL, bBigImages); + aImage = framework::AddonsOptions().GetImageFromURL(aCommandURL, bBig); SetItemImage(it.first, aImage); } } |