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

Resolves: tdf#103783 do consider parent of WB_DIALOGCONTROL widgets...

for tab cycling, given the problem of tdf#103783

regression from...

commit fd40e3ea
Author: Caolán McNamara <caolanm@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

but only check the Parent, not RealParent

Change-Id: I9577a0a9f3a622373c195e77ca43d17511b4154d
üst 006884d7
......@@ -169,9 +169,14 @@ 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) )
{
bRet = ImplDlgCtrl(*rNEvt.GetKeyEvent(), rNEvt.GetType() == MouseNotifyEvent::KEYINPUT);
if ( ImplIsOverlapWindow() ||
((getNonLayoutParent(this)->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) )
{
bRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == MouseNotifyEvent::KEYINPUT );
}
}
else if ( (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) || (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS) )
{
......
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