diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-07-02 15:19:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-02 15:20:29 +0100 |
| commit | 00601259144f5b49b516581ca6ae28fc6e524030 (patch) | |
| tree | 5ba6a52055c1c142dbed03cd61429e17b2a01ff4 /vcl | |
| parent | 50b0bf15bf0e173ba449efed93ef3909253b9988 (diff) | |
Resolves: fdo#66502 set AutoMnemonics before calculating layout
Change-Id: I3274ec9e8e4e1f61f0108a3e6ba64107128736c2
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 0a63d2514b2f..4f6d45860c99 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -701,6 +701,9 @@ void Dialog::StateChanged( StateChangedType nType ) if ( nType == STATE_CHANGE_INITSHOW ) { + if ( GetSettings().GetStyleSettings().GetAutoMnemonic() ) + ImplWindowAutoMnemonic( this ); + if (isLayoutEnabled()) { mbIsCalculatingInitialLayoutSize = true; @@ -709,9 +712,6 @@ void Dialog::StateChanged( StateChangedType nType ) mbIsCalculatingInitialLayoutSize = false; } - if ( GetSettings().GetStyleSettings().GetAutoMnemonic() ) - ImplWindowAutoMnemonic( this ); - if ( !HasChildPathFocus() || HasFocus() ) GrabFocusToFirstControl(); if ( !(GetStyle() & WB_CLOSEABLE) ) |