Kaydet (Commit) 1bacc177 authored tarafından Caolán McNamara's avatar Caolán McNamara

move ImplWindowAutoMnemonic into DoInitialLayout

so Floating windows get automnemonics as well, e.g.
the Floating Sort floating window of reportdesign

Change-Id: I0805840f7b0b2329e210c77e32c5eabfdac387fb
üst 3253b864
...@@ -618,9 +618,6 @@ void Dialog::StateChanged( StateChangedType nType ) ...@@ -618,9 +618,6 @@ void Dialog::StateChanged( StateChangedType nType )
{ {
if (nType == STATE_CHANGE_INITSHOW) if (nType == STATE_CHANGE_INITSHOW)
{ {
if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
ImplWindowAutoMnemonic( this );
DoInitialLayout(); DoInitialLayout();
if ( !HasChildPathFocus() || HasFocus() ) if ( !HasChildPathFocus() || HasFocus() )
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <vcl/layout.hxx> #include <vcl/layout.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/menu.hxx> #include <vcl/menu.hxx>
#include <vcl/event.hxx> #include <vcl/event.hxx>
...@@ -1089,8 +1090,13 @@ void SystemWindow::setOptimalLayoutSize() ...@@ -1089,8 +1090,13 @@ void SystemWindow::setOptimalLayoutSize()
setPosSizeOnContainee(aSize, *pBox); setPosSizeOnContainee(aSize, *pBox);
} }
extern void ImplWindowAutoMnemonic(Window* pWindow);
void SystemWindow::DoInitialLayout() void SystemWindow::DoInitialLayout()
{ {
if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
ImplWindowAutoMnemonic( this );
if (isLayoutEnabled()) if (isLayoutEnabled())
{ {
mbIsCalculatingInitialLayoutSize = true; mbIsCalculatingInitialLayoutSize = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment