From b1426b5b502fd591402d666994e3f1fb3a8ad959 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Sun, 30 Oct 2016 16:24:37 +0100 Subject: tdf#95014 initial support for 32 px icons in toolbar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Tomaž Vajngerl --- svtools/source/config/miscopt.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'svtools') diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 00d283b3d872..9abf5820f8af 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -825,7 +825,9 @@ sal_Int16 SvtMiscOptions::GetCurrentSymbolsSize() const // Use system settings, we have to retrieve the toolbar icon size from the // Application class ToolbarIconSize nStyleIconSize = Application::GetSettings().GetStyleSettings().GetToolbarIconSize(); - if ( nStyleIconSize == ToolbarIconSize::Large ) + if (nStyleIconSize == ToolbarIconSize::Size32) + eOptSymbolsSize = SFX_SYMBOLS_SIZE_32; + else if (nStyleIconSize == ToolbarIconSize::Large) eOptSymbolsSize = SFX_SYMBOLS_SIZE_LARGE; else eOptSymbolsSize = SFX_SYMBOLS_SIZE_SMALL; @@ -836,7 +838,7 @@ sal_Int16 SvtMiscOptions::GetCurrentSymbolsSize() const bool SvtMiscOptions::AreCurrentSymbolsLarge() const { - return ( GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE ); + return ( GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_LARGE || GetCurrentSymbolsSize() == SFX_SYMBOLS_SIZE_32); } OUString SvtMiscOptions::GetIconTheme() const -- cgit