Merge branch 'linuxfix' of https://github.com/sephiroth99/xenia into sephiroth99-linuxfix

This commit is contained in:
Ben Vanik
2015-12-31 14:39:23 -08:00
16 changed files with 124 additions and 64 deletions

View File

@@ -274,6 +274,9 @@ void ImGuiDrawer::OnMouseDown(MouseEvent* e) {
case xe::ui::MouseEvent::Button::kRight: {
io.MouseDown[1] = true;
} break;
default: {
// Ignored.
} break;
}
}
@@ -292,6 +295,9 @@ void ImGuiDrawer::OnMouseUp(MouseEvent* e) {
case xe::ui::MouseEvent::Button::kRight: {
io.MouseDown[1] = false;
} break;
default: {
// Ignored.
} break;
}
}

View File

@@ -9,6 +9,8 @@
#include "xenia/ui/window.h"
#include <algorithm>
#include "third_party/imgui/imgui.h"
#include "xenia/base/assert.h"
#include "xenia/base/clock.h"