ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

elemental-forms is mostly style-clean.

This commit is contained in:
Ben Vanik 2015-08-09 12:07:07 -07:00
parent 0686227d23
commit 03142614ec
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/xenia/ui/window.cc
View File

@ -381,7 +381,7 @@ void Window::OnKeyPress(KeyEvent* e, bool is_down, bool is_char) {
if (!is_down && el::Element::focused_element) { if (!is_down && el::Element::focused_element) {
el::Event ev(el::EventType::kContextMenu); el::Event ev(el::EventType::kContextMenu);
ev.modifierkeys = GetModifierKeys(); ev.modifierkeys = GetModifierKeys();
el::Element::focused_element->InvokeEvent(ev); el::Element::focused_element->InvokeEvent(std::move(ev));
e->set_handled(true); e->set_handled(true);
return; return;
} }
@ -461,7 +461,7 @@ bool Window::CheckShortcutKey(KeyEvent* e, el::SpecialKey special_key,
el::Event ev(el::EventType::kShortcut); el::Event ev(el::EventType::kShortcut);
ev.modifierkeys = GetModifierKeys(); ev.modifierkeys = GetModifierKeys();
ev.ref_id = id; ev.ref_id = id;
if (!el::Element::focused_element->InvokeEvent(ev)) { if (!el::Element::focused_element->InvokeEvent(std::move(ev))) {
return false; return false;
} }
e->set_handled(true); e->set_handled(true);
@ -551,10 +551,10 @@ void Window::OnMouseUp(MouseEvent* e) {
if (el::Element::hovered_element) { if (el::Element::hovered_element) {
int x = e->x(); int x = e->x();
int y = e->y(); int y = e->y();
el::Element::hovered_element->ConvertFromRoot(x, y); el::Element::hovered_element->ConvertFromRoot(&x, &y);
el::Event ev(el::EventType::kContextMenu, x, y, kTouch, el::Event ev(el::EventType::kContextMenu, x, y, kTouch,
GetModifierKeys()); GetModifierKeys());
el::Element::hovered_element->InvokeEvent(ev); el::Element::hovered_element->InvokeEvent(std::move(ev));
} }
e->set_handled(true); e->set_handled(true);
} }

2
third_party/elemental-forms vendored

@ -1 +1 @@
Subproject commit 5da70a8d7663a6c360436b9ba168a96ad145f45d Subproject commit 696a19055a437e3a96d131bbb5803708e64e0146