diff options
author | Jim Raykowski <raykowj@gmail.com> | 2019-02-21 16:04:04 -0900 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-03-13 17:36:46 +0100 |
commit | 24c1ef579eed3827fc34312a9127244a13b9b5ac (patch) | |
tree | 5f6915f4ed48b74ae229b1d551320eff5b394961 /sfx2 | |
parent | 4b190dcd17a12706e8cc555026c5e6852124ede5 (diff) |
tdf#102005 Fix F6 regression in start center
Change-Id: I152a79b79e75bf87c437dd4dd2976c73198e6b52
Reviewed-on: https://gerrit.libreoffice.org/68185
Tested-by: Jenkins
Reviewed-by: V Stuart Foote <vstuart.foote@utsa.edu>
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
(cherry picked from commit 77fe54df21195a1b0483fb06466ced935a186030)
Reviewed-on: https://gerrit.libreoffice.org/69175
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/backingwindow.cxx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx index 14b4e6673ca3..c11bf2491163 100644 --- a/sfx2/source/dialog/backingwindow.cxx +++ b/sfx2/source/dialog/backingwindow.cxx @@ -420,15 +420,18 @@ bool BackingWindow::PreNotify(NotifyEvent& rNEvt) } else // F6 { - if(mpAllRecentThumbnails->IsVisible()) - { - mpAllRecentThumbnails->GrabFocus(); - return true; - } - else if(mpLocalView->IsVisible()) + if( mpAllButtonsBox->HasChildPathFocus() ) { - mpLocalView->GrabFocus(); - return true; + if(mpAllRecentThumbnails->IsVisible()) + { + mpAllRecentThumbnails->GrabFocus(); + return true; + } + else if(mpLocalView->IsVisible()) + { + mpLocalView->GrabFocus(); + return true; + } } } } |