diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-05-08 10:24:18 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-05-16 15:40:11 +0200 |
| commit | f9905401d8cf2d73576231ebd84cfa5f4f73bcac (patch) | |
| tree | c4151d098222cac20c53f6651595e5cb6ca410d0 /sw/qa/uitest | |
| parent | 1489aa7467a2131e48d2995107d1415d9e59ea9e (diff) | |
tdf#125170 Deliver mouse events also when clicking into document content
Event listeners are added once VCLXWindow::SetWindow is called.
This never happened for the document content window.
So we need to call Window::GetComponentInterface which will create an XWindowPeer
and then call UnoWrapper::SetWindowInterface which calls VCLXWindow::SetWindow.
After that, event listeners are registered so that we can deliver events.
Change-Id: I2ed01f1ab20d87fedc4803bdbd96f5ef14d40043
Reviewed-on: https://gerrit.libreoffice.org/71948
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/qa/uitest')
| -rw-r--r-- | sw/qa/uitest/writer_tests5/xwindow.py | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/sw/qa/uitest/writer_tests5/xwindow.py b/sw/qa/uitest/writer_tests5/xwindow.py index 7b96b53c495d..bdfbfecff17e 100644 --- a/sw/qa/uitest/writer_tests5/xwindow.py +++ b/sw/qa/uitest/writer_tests5/xwindow.py @@ -10,6 +10,7 @@ import unohelper from org.libreoffice.unotest import UnoInProcess from com.sun.star.awt import XMouseListener from com.sun.star.awt import XToolkitRobot +from com.sun.star.awt import MouseButton from com.sun.star.awt import MouseEvent from com.sun.star.awt import KeyEvent from com.sun.star.awt import XKeyListener @@ -96,21 +97,35 @@ class XWindow(UITestCase): # create dummy mouse event xMouseEvent = MouseEvent() xMouseEvent.Modifiers = 0 - xMouseEvent.Buttons = 0 + xMouseEvent.Buttons = MouseButton.LEFT xMouseEvent.X = 10 xMouseEvent.Y = 10 xMouseEvent.ClickCount = 1 xMouseEvent.PopupTrigger = False xMouseEvent.Source = xWindow + xMouseEvent2 = MouseEvent() + xMouseEvent2.Modifiers = 0 + xMouseEvent2.Buttons = MouseButton.LEFT + xMouseEvent2.X = 300 + xMouseEvent2.Y = 300 + xMouseEvent2.ClickCount = 1 + xMouseEvent2.PopupTrigger = False + xMouseEvent2.Source = xWindow + # send mouse event xToolkitRobot = xWindow.getToolkit() self.assertIsNotNone(xToolkitRobot) - xToolkitRobot.mousePress(xMouseEvent) + # Click in the menubar/toolbar area xToolkitRobot.mouseMove(xMouseEvent) + xToolkitRobot.mousePress(xMouseEvent) xToolkitRobot.mouseRelease(xMouseEvent) + # Click into the document content + xToolkitRobot.mousePress(xMouseEvent2) + xToolkitRobot.mouseRelease(xMouseEvent2) + # send key press event xKeyEvent = KeyEvent() xKeyEvent.Modifiers = 0 @@ -139,8 +154,8 @@ class XWindow(UITestCase): self.assertEqual(0, keymouseEventsIntercepted) global mouseEventsIntercepted - # mousePressed, mouseReleased and mouseEntered should be triggered - self.assertEqual(3, mouseEventsIntercepted) + # mousePressed (2x), mouseReleased (2x) and mouseEntered (1x) should be triggered + self.assertEqual(5, mouseEventsIntercepted) # close document self.ui_test.close_doc() |