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

Latest imgui. 

Fixes #286.
This commit is contained in:
Ben Vanik 2015-06-26 19:32:08 -07:00
parent 3b42b7b694
commit dd41f01c41
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/gpu/xe-gpu-trace-viewer.cc
View File

@ -859,7 +859,7 @@ void DrawControllerUI(xe::ui::MainWindow* window, TracePlayer& player,
ImGui::SetTooltip("Reset to first frame"); ImGui::SetTooltip("Reset to first frame");
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button(">>", ImVec2(0, 0), true)) { if (ImGui::Button(">>", ImVec2(0, 0))) {
if (target_frame + 1 < player.frame_count()) { if (target_frame + 1 < player.frame_count()) {
++target_frame; ++target_frame;
} }
@ -913,7 +913,7 @@ void DrawCommandListUI(xe::ui::MainWindow* window, TracePlayer& player,
ImGui::SetTooltip("Reset to before any frame commands"); ImGui::SetTooltip("Reset to before any frame commands");
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("prev", ImVec2(0, 0), true)) { if (ImGui::Button("prev", ImVec2(0, 0))) {
if (target_command >= 0) { if (target_command >= 0) {
--target_command; --target_command;
} }
@ -922,7 +922,7 @@ void DrawCommandListUI(xe::ui::MainWindow* window, TracePlayer& player,
ImGui::SetTooltip("Move to the previous command (hold)"); ImGui::SetTooltip("Move to the previous command (hold)");
} }
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("next", ImVec2(0, 0), true)) { if (ImGui::Button("next", ImVec2(0, 0))) {
if (target_command < command_count - 1) { if (target_command < command_count - 1) {
++target_command; ++target_command;
} }
@ -2173,7 +2173,7 @@ void DrawPacketDisassemblerUI(xe::ui::MainWindow* window, TracePlayer& player,
} }
void DrawUI(xe::ui::MainWindow* window, TracePlayer& player, Memory* memory) { void DrawUI(xe::ui::MainWindow* window, TracePlayer& player, Memory* memory) {
ImGui::ShowTestWindow(); // ImGui::ShowTestWindow();
DrawControllerUI(window, player, memory); DrawControllerUI(window, player, memory);
DrawCommandListUI(window, player, memory); DrawCommandListUI(window, player, memory);

2
third_party/imgui vendored

@ -1 +1 @@
Subproject commit 19f7bf90f86063dbbc59e93c3f5a973e75ec696b Subproject commit 14f189b2f62ec2f79875e7c897a42415fe96fde6