[Libreoffice-commits] core.git: Branch 'feature/eszka' - 4 commits - sc/qa sc/source vcl/source
Szymon KÅ‚os (via logerrit)
logerrit at kemper.freedesktop.org
Thu Nov 12 09:42:12 UTC 2020
sc/qa/uitest/autofilter/autofilter.py | 2 +-
sc/source/ui/cctrl/checklistmenu.cxx | 4 ++--
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/uitest/uiobject.cxx | 1 +
vcl/source/window/event.cxx | 6 +++++-
5 files changed, 10 insertions(+), 5 deletions(-)
New commits:
commit 7bbe13634c43fc51806c173dfcb7f88257f39ba8
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Thu Nov 12 10:41:22 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Nov 12 10:41:22 2020 +0100
Fix uitests for autofilter menu
Change-Id: Ifd7d39f787d7530da62fbe479e7b70f656a67911
diff --git a/sc/qa/uitest/autofilter/autofilter.py b/sc/qa/uitest/autofilter/autofilter.py
index 47b94a6807bc..3c76f072a565 100644
--- a/sc/qa/uitest/autofilter/autofilter.py
+++ b/sc/qa/uitest/autofilter/autofilter.py
@@ -80,7 +80,7 @@ class AutofilterTest(UITestCase):
xFloatWindow = self.xUITest.getFloatWindow()
xCheckListMenu = xFloatWindow.getChild("check_list_menu")
- xTreeList = xCheckListMenu.getChild("check_list_box")
+ xTreeList = xCheckListMenu.getChild("check_tree_box")
self.assertEqual(2, len(xTreeList.getChildren()))
self.assertTrue(get_state_as_dict(xTreeList.getChild('0'))['IsSelected'])
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 313409a6fce0..452e7c1eb61a 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -138,8 +138,8 @@ void ScCheckListMenuControl::addMenuItem(const OUString& rText, Action* pAction)
void ScCheckListMenuControl::addSeparator()
{
- MenuItemData aItem;
- maMenuItems.emplace_back(std::move(aItem));
+ //MenuItemData aItem;
+ //maMenuItems.emplace_back(std::move(aItem));
//mxMenu->append_separator("separator" + OUString::number(maMenuItems.size()));
}
commit 04d6ab07db5b5dde736ce689d8dbbbf1ef0b0fc0
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jun 9 16:52:31 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Nov 12 10:32:44 2020 +0100
ignore WB_DIALOGCONTROL state of parent if we're a floating window
for tab key cycling
When WB_DIALOGCONTROL is set the control has sub controls in it and pressing
tab cycles through those widgets, and back to the start.
If a WB_DIALOGCONTROL control is inside a WB_DIALOGCONTROL control
the toplevel container is the one that processes the tab.
But we don't want a floating popup window, like ScCheckListMenuControl, which
has its own toplevel floating window, to pass the tab key to its parent
ScGridWindow for that to process, we want it to stop at the
ScCheckListMenuControl level so it will cycle back to ScCheckListMenuControl's
first child after passing the last one, not into some other child of
ScGridWindow.
ScGridWindow is unusual as a document window to have WB_DIALOGCONTROL set for
its own reasons: i.e. "WB_DIALOGCONTROL needed for UNO-Controls" so this
problem does't arise in other applications
Change-Id: Ib1f02ca4b0bf5bf3b2ed00b5838f8df2e3eb5b7b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95957
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index 31733682c18f..82e248bf3710 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -183,7 +183,11 @@ bool Window::EventNotify( NotifyEvent& rNEvt )
// if the parent also has dialog control activated, the parent takes over control
if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) || (rNEvt.GetType() == MouseNotifyEvent::KEYUP) )
{
- if (ImplIsOverlapWindow() || parentNotDialogControl(this))
+ // ScGridWindow has WB_DIALOGCONTROL set, so pressing tab in ScCheckListMenuControl won't
+ // get processed here by the toplevel DockingWindow of ScCheckListMenuControl by
+ // just checking if parentNotDialogControl is true
+ bool bTopLevelFloatingWindow = (pWrapper && pWrapper->IsFloatingMode());
+ if (ImplIsOverlapWindow() || parentNotDialogControl(this) || bTopLevelFloatingWindow)
{
bRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == MouseNotifyEvent::KEYINPUT );
}
commit ec8cf6a7e6ddcd8ba658448133105a82444511b4
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jun 12 15:03:35 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Nov 12 09:52:31 2020 +0100
add SPACE keycode to uitesting list
Change-Id: I3f330409b994d85ab5605ae3e8a184851902f811
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96205
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index 3d6242697066..a23b8302d724 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -189,6 +189,7 @@ std::vector<KeyEvent> generate_key_events_from_keycode(const OUString& rStr)
{"RIGHT", KEY_RIGHT},
{"DELETE", KEY_DELETE},
{"INSERT", KEY_INSERT},
+ {"SPACE", KEY_SPACE},
{"BACKSPACE", KEY_BACKSPACE},
{"RETURN", KEY_RETURN},
{"HOME", KEY_HOME},
commit 1c36a92c4a4b0add2b7963d413c17902389e0389
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jun 11 20:01:39 2020 +0100
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Thu Nov 12 08:42:58 2020 +0100
don't skip first column on toggle column check anymore
Change-Id: Id9083ec432cba556538605692021d8c348322a16
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96164
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 98533945d6da..db5b3d97d6f1 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -4640,7 +4640,7 @@ IMPL_LINK(SalInstanceTreeView, ToggleHdl, SvLBoxButtonData*, pData, void)
// node was clicked
m_xTreeView->pImpl->m_pCursor = pEntry;
- for (int i = 1, nCount = pEntry->ItemCount(); i < nCount; ++i)
+ for (int i = 0, nCount = pEntry->ItemCount(); i < nCount; ++i)
{
SvLBoxItem& rItem = pEntry->GetItem(i);
if (&rItem == pBox)
More information about the Libreoffice-commits
mailing list