diff options
| author | Szymon Kłos <eszkadev@gmail.com> | 2016-08-16 09:40:27 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2016-08-17 07:20:16 +0000 |
| commit | ce59d3be31c144279a8ab857a2f1fc71bafab343 (patch) | |
| tree | 69b2a0a04de37fb45e264ea8db586e002d804520 /include | |
| parent | 9a3457b1be0f78e21b572f660ce170a6f09c56e3 (diff) | |
GSoC notebookbar: BigToolBox
+ New container: sfxlo-BigToolBox
+ Writer: Paste button with dropdown menu
Change-Id: I8fa9ff2cbf594078cc2347bef790b8647ce4e6ea
Reviewed-on: https://gerrit.libreoffice.org/28156
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/sidebar/SidebarToolBox.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/toolbox.hxx | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 131364d51f66..17a8e48e1202 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -59,7 +59,7 @@ public: css::uno::Reference<css::frame::XToolbarController> GetFirstController(); -private: +protected: typedef std::map<sal_uInt16, css::uno::Reference<css::frame::XToolbarController>> ControllerContainer; ControllerContainer maControllers; bool mbAreHandlersRegistered; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 06df8594c644..96a25803fe7a 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -68,6 +68,9 @@ enum ToolBoxButtonSize { TOOLBOX_BUTTONSIZE_DONTCARE, TOOLBOX_BUTTONSIZE_SMALL, // toolbox is prevented from centering the items enum class ToolBoxLayoutMode { Normal, LockVert }; +// Position of the text when icon and text are painted +enum ToolBoxTextPosition { Right, Bottom }; + struct ImplToolSize { long mnWidth; @@ -146,6 +149,7 @@ private: PointerStyle meLastStyle; WinBits mnWinStyle; ToolBoxLayoutMode meLayoutMode; + ToolBoxTextPosition meTextPosition; Link<ToolBox *, void> maClickHdl; Link<ToolBox *, void> maDoubleClickHdl; Link<ToolBox *, void> maActivateHdl; @@ -511,6 +515,8 @@ public: void SetToolbarLayoutMode( ToolBoxLayoutMode eLayout ); void statusChanged(const css::frame::FeatureStateEvent& rEvent); + + void SetToolBoxTextPosition( ToolBoxTextPosition ePosition ); }; inline void ToolBox::CheckItem( sal_uInt16 nItemId, bool bCheck ) |