mirror/xemu
3
0
Fork 0
mirror of https://github.com/mborgerson/xemu.git synced 2026-02-04 18:15:37 +00:00
Code Issues Projects Releases Wiki Activity

meson: Update imgui,implot

Browse Source
This commit is contained in:
Matt Borgerson
2025-03-08 03:17:17 -07:00
committed by mborgerson
parent 1d662cb49e
commit 355228913c
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
subprojects/imgui.wrap
View File

@ -1,4 +1,4 @@
[wrap-git] [wrap-git]
url=https://github.com/xemu-project/imgui url=https://github.com/xemu-project/imgui
revision=80cbdab5ecd70db79917c448c333163995e605a5 revision=7219d617a32b594f9a80b2356aec42e0e939e938
depth=1 depth=1

2
subprojects/implot.wrap
View File

@ -1,4 +1,4 @@
[wrap-git] [wrap-git]
url=https://github.com/xemu-project/implot url=https://github.com/xemu-project/implot
revision=006a1c23e5706bbe816968163b4d589162257a57 revision=8553562dbb2025fd520f4bed57b094767b96c670
depth=1 depth=1

7
ui/xui/main-menu.cc
View File

@ -130,12 +130,15 @@ void MainMenuInputView::Draw()
float x = b_x + i * b_x_stride; float x = b_x + i * b_x_stride;
ImGui::PushStyleColor(ImGuiCol_Button, ImGui::PushStyleColor(ImGuiCol_Button,
is_selected ? color_active : color_inactive); is_selected ? color_active : color_inactive);
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,
g_viewport_mgr.Scale(ImVec2(port_padding, port_padding)));
bool activated = ImGui::ImageButton( bool activated = ImGui::ImageButton(
"port_image_button",
id, id,
ImVec2(b_w * g_viewport_mgr.m_scale, b_h * g_viewport_mgr.m_scale), ImVec2(b_w * g_viewport_mgr.m_scale, b_h * g_viewport_mgr.m_scale),
ImVec2(x / t_w, (b_y + b_h) / t_h), ImVec2(x / t_w, (b_y + b_h) / t_h),
ImVec2((x + b_w) / t_w, b_y / t_h), ImVec2((x + b_w) / t_w, b_y / t_h));
port_padding * g_viewport_mgr.m_scale); ImGui::PopStyleVar();
ImGui::PopStyleColor(); ImGui::PopStyleColor();
if (activated) { if (activated) {

2
ui/xui/main.cc
View File

@ -208,7 +208,7 @@ void xemu_hud_render(void)
ImGui_ImplOpenGL3_NewFrame(); ImGui_ImplOpenGL3_NewFrame();
io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad; io.ConfigFlags &= ~ImGuiConfigFlags_NavEnableGamepad;
ImGui_ImplSDL2_NewFrame(g_sdl_window); ImGui_ImplSDL2_NewFrame();
io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad; io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;
io.BackendFlags |= ImGuiBackendFlags_HasGamepad; io.BackendFlags |= ImGuiBackendFlags_HasGamepad;
g_input_mgr.Update(); g_input_mgr.Update();