Skip to content

Commit a471bf6

Browse files
Andrii BoichukAndrii Boichuk
authored andcommitted
Merge branch 'WD_1.X_dev' of https://portal-ua.globallogic.com/git/wd into WD_1.X_dev
2 parents 8badc99 + decf8a0 commit a471bf6

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/webdriver/extension_qt/qml_web_view_executor.cc

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,11 @@ void QmlWebViewCmdExecutor::SendKeys(const string16& keys, Error** error) {
192192

193193
std::string err_msg;
194194
std::vector<QKeyEvent> key_events;
195-
int modifiers = Qt::NoModifier;
195+
int modifiers = session_->get_sticky_modifiers();
196196

197197
if (!QKeyConverter::ConvertKeysToWebKeyEvents(keys,
198198
session_->logger(),
199-
true,
199+
false,
200200
&modifiers,
201201
&key_events,
202202
&err_msg)) {
@@ -205,9 +205,15 @@ void QmlWebViewCmdExecutor::SendKeys(const string16& keys, Error** error) {
205205
return;
206206
}
207207

208+
session_->set_sticky_modifiers(modifiers);
209+
208210
std::vector<QKeyEvent>::iterator it = key_events.begin();
209211
while (it != key_events.end()) {
210-
qApp->sendEvent(view_->page(), &(*it));
212+
213+
bool consumed = WDEventDispatcher::getInstance()->dispatch(&(*it));
214+
215+
if (!consumed)
216+
qApp->sendEvent(view_->page(), &(*it));
211217
++it;
212218
}
213219
}

0 commit comments

Comments
 (0)