diff options
| author | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-30 20:37:12 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <s.mehrbrodt@gmail.com> | 2014-09-30 20:41:21 +0200 |
| commit | d59e33500a250824e713afacef2ea295576caba6 (patch) | |
| tree | 12f95f7e51253dd33767c89907109f0c6d6d0568 /vcl/source/control | |
| parent | 4badca074088b1f1a70b340d53fc464ec11e3d29 (diff) | |
fdo#62081 Improve split menu on style dropdown
* Remove "Apply style"
* Add "Update Style Based on Selection"
* A11y:
* Context menu key: Open submenu
* Return key: Apply style
Change-Id: Ib2960baa1412a05ea00b0e214d1af0a3d119e852
Diffstat (limited to 'vcl/source/control')
| -rw-r--r-- | vcl/source/control/menubtn.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx index 288b7abeb018..a4ffdf8482b3 100644 --- a/vcl/source/control/menubtn.cxx +++ b/vcl/source/control/menubtn.cxx @@ -46,7 +46,7 @@ void MenuButton::ImplInit( vcl::Window* pParent, WinBits nStyle ) EnableRTL( Application::GetSettings().GetLayoutRTL() ); } -void MenuButton::ImplExecuteMenu() +void MenuButton::ExecuteMenu() { Activate(); @@ -93,7 +93,7 @@ IMPL_LINK_NOARG(MenuButton, ImplMenuTimeoutHdl) { if ( !(GetStyle() & WB_NOPOINTERFOCUS) ) GrabFocus(); - ImplExecuteMenu(); + ExecuteMenu(); } return 0; @@ -127,7 +127,7 @@ void MenuButton::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !(GetStyle() & WB_NOPOINTERFOCUS) ) GrabFocus(); - ImplExecuteMenu(); + ExecuteMenu(); } } } @@ -137,11 +137,11 @@ void MenuButton::KeyInput( const KeyEvent& rKEvt ) vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); sal_uInt16 nCode = aKeyCode.GetCode(); if ( (nCode == KEY_DOWN) && aKeyCode.IsMod2() ) - ImplExecuteMenu(); + ExecuteMenu(); else if ( !(mnMenuMode & MENUBUTTON_MENUMODE_TIMED) && !aKeyCode.GetModifier() && ((nCode == KEY_RETURN) || (nCode == KEY_SPACE)) ) - ImplExecuteMenu(); + ExecuteMenu(); else PushButton::KeyInput( rKEvt ); } |