[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/dialog/backingwindow.cxx |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 24c1ef579eed3827fc34312a9127244a13b9b5ac
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Thu Feb 21 16:04:04 2019 -0900
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Mar 13 17:36:46 2019 +0100

    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 at utsa.edu>
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>
    (cherry picked from commit 77fe54df21195a1b0483fb06466ced935a186030)
    Reviewed-on: https://gerrit.libreoffice.org/69175
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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;
+                    }
                 }
             }
         }