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

Updating deps.

This commit is contained in:
Ben Vanik 2015-05-01 18:53:39 -07:00
parent 6d8a226d7f
commit 98e7e2727b
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/xenia/gpu/trace_viewer_main.cc
View File

@ -833,7 +833,7 @@ class TracePlayer : public TraceReader {
void DrawControllerUI(xe::ui::MainWindow* window, TracePlayer& player, void DrawControllerUI(xe::ui::MainWindow* window, TracePlayer& player,
Memory* memory) { Memory* memory) {
ImGui::SetNextWindowPos(ImVec2(5, 5), ImGuiSetCondition_FirstUseEver); ImGui::SetNextWindowPos(ImVec2(5, 5), ImGuiSetCond_FirstUseEver);
if (!ImGui::Begin("Controller", nullptr, ImVec2(340, 60))) { if (!ImGui::Begin("Controller", nullptr, ImVec2(340, 60))) {
ImGui::End(); ImGui::End();
return; return;
@ -872,7 +872,7 @@ void DrawControllerUI(xe::ui::MainWindow* window, TracePlayer& player,
void DrawCommandListUI(xe::ui::MainWindow* window, TracePlayer& player, void DrawCommandListUI(xe::ui::MainWindow* window, TracePlayer& player,
Memory* memory) { Memory* memory) {
ImGui::SetNextWindowPos(ImVec2(5, 70), ImGuiSetCondition_FirstUseEver); ImGui::SetNextWindowPos(ImVec2(5, 70), ImGuiSetCond_FirstUseEver);
if (!ImGui::Begin("Command List", nullptr, ImVec2(200, 640))) { if (!ImGui::Begin("Command List", nullptr, ImVec2(200, 640))) {
ImGui::End(); ImGui::End();
return; return;
@ -1385,7 +1385,7 @@ void DrawStateUI(xe::ui::MainWindow* window, TracePlayer& player,
auto& regs = *gs->register_file(); auto& regs = *gs->register_file();
ImGui::SetNextWindowPos(ImVec2(float(window->width()) - 500 - 5, 30), ImGui::SetNextWindowPos(ImVec2(float(window->width()) - 500 - 5, 30),
ImGuiSetCondition_FirstUseEver); ImGuiSetCond_FirstUseEver);
if (!ImGui::Begin("State", nullptr, ImVec2(500, 680))) { if (!ImGui::Begin("State", nullptr, ImVec2(500, 680))) {
ImGui::End(); ImGui::End();
return; return;
@ -2020,9 +2020,9 @@ void DrawStateUI(xe::ui::MainWindow* window, TracePlayer& player,
void DrawPacketDisassemblerUI(xe::ui::MainWindow* window, TracePlayer& player, void DrawPacketDisassemblerUI(xe::ui::MainWindow* window, TracePlayer& player,
Memory* memory) { Memory* memory) {
ImGui::SetNextWindowCollapsed(true, ImGuiSetCondition_FirstUseEver); ImGui::SetNextWindowCollapsed(true, ImGuiSetCond_FirstUseEver);
ImGui::SetNextWindowPos(ImVec2(float(window->width()) - 500 - 5, 5), ImGui::SetNextWindowPos(ImVec2(float(window->width()) - 500 - 5, 5),
ImGuiSetCondition_FirstUseEver); ImGuiSetCond_FirstUseEver);
if (!ImGui::Begin("Packet Disassembler", nullptr, ImVec2(500, 300))) { if (!ImGui::Begin("Packet Disassembler", nullptr, ImVec2(500, 300))) {
ImGui::End(); ImGui::End();
return; return;
@ -2414,8 +2414,6 @@ void ImImpl_Setup() {
style.Colors[ImGuiCol_ScrollbarGrabActive] = style.Colors[ImGuiCol_ScrollbarGrabActive] =
ImVec4(0.00f, 0.91f, 0.09f, 0.40f); ImVec4(0.00f, 0.91f, 0.09f, 0.40f);
style.Colors[ImGuiCol_ComboBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.99f); style.Colors[ImGuiCol_ComboBg] = ImVec4(0.20f, 0.20f, 0.20f, 0.99f);
style.Colors[ImGuiCol_CheckHovered] = ImVec4(0.23f, 0.64f, 0.13f, 0.45f);
style.Colors[ImGuiCol_CheckActive] = ImVec4(0.21f, 0.93f, 0.13f, 0.55f);
style.Colors[ImGuiCol_CheckMark] = ImVec4(0.74f, 0.90f, 0.72f, 0.50f); style.Colors[ImGuiCol_CheckMark] = ImVec4(0.74f, 0.90f, 0.72f, 0.50f);
style.Colors[ImGuiCol_SliderGrab] = ImVec4(1.00f, 1.00f, 1.00f, 0.30f); style.Colors[ImGuiCol_SliderGrab] = ImVec4(1.00f, 1.00f, 1.00f, 0.30f);
style.Colors[ImGuiCol_SliderGrabActive] = ImVec4(0.34f, 0.75f, 0.11f, 1.00f); style.Colors[ImGuiCol_SliderGrabActive] = ImVec4(0.34f, 0.75f, 0.11f, 1.00f);

2
third_party/imgui vendored

@ -1 +1 @@
Subproject commit 364d4a1ae6fb2ec4dca8dc41d5c844ab3ab092a5 Subproject commit 19f7bf90f86063dbbc59e93c3f5a973e75ec696b

2
third_party/xbyak vendored

@ -1 +1 @@
Subproject commit 7e240e78b8d3b6241911711437eccfa299a84799 Subproject commit fca4af9ecaf0ac2e80065c362a36adff12fc0678