From 26f4e6fc8fe10c9d9ca48719cca762d823086722 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Sun, 10 Jan 2021 20:15:21 -0700 Subject: [PATCH] ui: Update to new imgui paths/rounding --- ui/Makefile.objs | 6 ++++-- ui/xemu-hud.cc | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/Makefile.objs b/ui/Makefile.objs index ba05ba8eb7..f0152a016d 100644 --- a/ui/Makefile.objs +++ b/ui/Makefile.objs @@ -30,9 +30,11 @@ endif sdl.mo-objs := \ imgui/imgui.o \ imgui/imgui_draw.o \ + imgui/imgui_tables.o \ + imgui/imgui_demo.o \ imgui/imgui_widgets.o \ - imgui/examples/imgui_impl_opengl3.o \ - imgui/examples/imgui_impl_sdl.o \ + imgui/backends/imgui_impl_opengl3.o \ + imgui/backends/imgui_impl_sdl.o \ xemu.o \ xemu-custom-widgets.o \ xemu-data.o \ diff --git a/ui/xemu-hud.cc b/ui/xemu-hud.cc index d43e969b97..6f49a2b9c1 100644 --- a/ui/xemu-hud.cc +++ b/ui/xemu-hud.cc @@ -37,8 +37,8 @@ #include "xemu-reporting.h" #include "imgui/imgui.h" -#include "imgui/examples/imgui_impl_sdl.h" -#include "imgui/examples/imgui_impl_opengl3.h" +#include "imgui/backends/imgui_impl_sdl.h" +#include "imgui/backends/imgui_impl_opengl3.h" extern "C" { #include "noc_file_dialog.h" @@ -1631,6 +1631,7 @@ static void InitializeStyle() ImGui_ImplOpenGL3_CreateFontsTexture(); ImGuiStyle style; + style.WindowRounding = 8.0; style.FrameRounding = 8.0; style.GrabRounding = 12.0; style.PopupRounding = 5.0;