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 /include/vcl | |
| 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 'include/vcl')
| -rw-r--r-- | include/vcl/CommandImageResolver.hxx | 8 | ||||
| -rw-r--r-- | include/vcl/commandinfoprovider.hxx | 5 | ||||
| -rw-r--r-- | include/vcl/settings.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/toolbox.hxx | 10 |
4 files changed, 17 insertions, 7 deletions
diff --git a/include/vcl/CommandImageResolver.hxx b/include/vcl/CommandImageResolver.hxx index 36f2f1e85881..f57e79e73889 100644 --- a/include/vcl/CommandImageResolver.hxx +++ b/include/vcl/CommandImageResolver.hxx @@ -24,9 +24,11 @@ namespace vcl enum class ImageType { - Color = 0, - Color_Large, - LAST = Color_Large + Size16, + Size26, + Size32, + Small = Size16, + LAST = Size32, }; class VCL_DLLPUBLIC CommandImageResolver diff --git a/include/vcl/commandinfoprovider.hxx b/include/vcl/commandinfoprovider.hxx index b15873fc4c0e..fff271b39a9a 100644 --- a/include/vcl/commandinfoprovider.hxx +++ b/include/vcl/commandinfoprovider.hxx @@ -22,6 +22,7 @@ #include <vcl/dllapi.h> #include <vcl/keycod.hxx> #include <vcl/image.hxx> +#include <vcl/CommandImageResolver.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -91,8 +92,8 @@ public: Image GetImageForCommand( const OUString& rsCommandName, - bool bLarge, - const css::uno::Reference<css::frame::XFrame>& rxFrame); + const css::uno::Reference<css::frame::XFrame>& rxFrame, + vcl::ImageType eImageType = vcl::ImageType::Small); sal_Int32 GetPropertiesForCommand( const OUString& rsCommandName, diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index bd516130abac..579b867e15aa 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -228,6 +228,7 @@ enum class ToolbarIconSize Unknown = 0, Small = 1, Large = 2, + Size32 = 3, }; #define STYLE_CURSOR_NOBLINKTIME SAL_MAX_UINT64 diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index ab1dfaf3a1a1..d7b6af8e92b9 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -58,9 +58,15 @@ namespace o3tl template<> struct typed_flags<ToolBoxMenuType> : is_typed_flags<ToolBoxMenuType, 0x0003> {}; } -// small or large force an exact toolbox size for proper alignemnt +// small, large, size32 force an exact toolbox size for proper alignemnt // dontcare will let the toolbox decide about its size -enum class ToolBoxButtonSize { DontCare, Small, Large }; +enum class ToolBoxButtonSize +{ + DontCare, + Small, + Large, + Size32, +}; // ToolBoxLayoutMode::Normal - traditional layout, items are centered in the toolbar // ToolBoxLayoutMode::LockVert - special mode (currently used for calc input/formula |