[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/source

[Caolán McNamara]

 include/vcl/layout.hxx       |    3 ---
 vcl/source/window/event.cxx  |    7 +------
 vcl/source/window/layout.cxx |   11 -----------
 3 files changed, 1 insertion(+), 20 deletions(-)

New commits:
commit 2734a6ce77b9b104e065b0bc3cc593b107f49883
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 1 16:36:43 2016 +0000

    getNonLayoutRealParent is unused
    
    Change-Id: Ie003bc7ccc9985162ea52a1b0164118d9c2ce437

diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 800f5ac..542788e 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -733,9 +733,6 @@ Size getLegacyBestSizeForChildren(const vcl::Window &rWindow);
 //Get first parent which is not a layout widget
 VCL_DLLPUBLIC vcl::Window* getNonLayoutParent(vcl::Window *pParent);
 
-//Get first real parent which is not a layout widget
-vcl::Window* getNonLayoutRealParent(vcl::Window *pParent);
-
 //return true if this window and its stack of containers are all shown
 bool isVisibleInLayout(const vcl::Window *pWindow);
 
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index d77de1b..8bed651 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -2676,17 +2676,6 @@ vcl::Window* getNonLayoutParent(vcl::Window *pWindow)
     return pWindow;
 }
 
-vcl::Window* getNonLayoutRealParent(vcl::Window *pWindow)
-{
-    while (pWindow)
-    {
-        pWindow = pWindow->ImplGetParent();
-        if (!pWindow || !isContainerWindow(*pWindow))
-            break;
-    }
-    return pWindow;
-}
-
 bool isVisibleInLayout(const vcl::Window *pWindow)
 {
     bool bVisible = true;
commit fd40e3ea09a481a2e97452d2244ecdfd6c3508c1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Nov 1 16:34:22 2016 +0000

    lock tab-cycling inside the WB_DIALOGCONTROL widget
    
    activate the color selector in the toolbar in the sidebar panel, press tab
    to cycle between its widgets, when it hits the bottom it will
    not return to the first widget, but escape out of the floating
    window into the next sibling of the toolbar
    
    Change-Id: I806fd4d94c477e9cfb2ea238830f7b646ea274d2

diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 5f145c7..7eb98cf 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -169,14 +169,9 @@ bool Window::Notify( NotifyEvent& rNEvt )
     // manage the dialogs
     if ( (GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) == WB_DIALOGCONTROL )
     {
-        // if the parent also has dialog control activated, the parent takes over control
         if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) || (rNEvt.GetType() == MouseNotifyEvent::KEYUP) )
         {
-            if ( ImplIsOverlapWindow() ||
-                 ((getNonLayoutRealParent(this)->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) )
-            {
-                bRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == MouseNotifyEvent::KEYINPUT );
-            }
+            bRet = ImplDlgCtrl(*rNEvt.GetKeyEvent(), rNEvt.GetType() == MouseNotifyEvent::KEYINPUT);
         }
         else if ( (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) || (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS) )
         {