diff --git a/external/imgui/CMakeLists.txt b/external/imgui/CMakeLists.txt index 98d708a..a645b89 100644 --- a/external/imgui/CMakeLists.txt +++ b/external/imgui/CMakeLists.txt @@ -9,7 +9,8 @@ endif() if (NOT TARGET imgui) FetchContent_Declare(imgui GIT_REPOSITORY https://github.com/ocornut/imgui.git - GIT_TAG f5befd2d29e66809cd1110a152e375a7f1981f06 # v1.91.9b + #GIT_TAG f5befd2d29e66809cd1110a152e375a7f1981f06 # v1.91.9b + GIT_TAG 85b2fe8486190fa9326565a2fb5fccb6caea4396 # v1.92.0 EXCLUDE_FROM_ALL ) diff --git a/flake.lock b/flake.lock index 19f2491..d4e1535 100644 --- a/flake.lock +++ b/flake.lock @@ -21,17 +21,17 @@ "imgui": { "flake": false, "locked": { - "lastModified": 1742239046, - "narHash": "sha256-dkukDP0HD8CHC2ds0kmqy7KiGIh4148hMCyA1QF3IMo=", + "lastModified": 1750870001, + "narHash": "sha256-qiESah4j/yHqkOuL5BYANvZfrSqM04CqKONz1jVnkJ0=", "owner": "ocornut", "repo": "imgui", - "rev": "f5befd2d29e66809cd1110a152e375a7f1981f06", + "rev": "85b2fe8486190fa9326565a2fb5fccb6caea4396", "type": "github" }, "original": { "owner": "ocornut", "repo": "imgui", - "rev": "f5befd2d29e66809cd1110a152e375a7f1981f06", + "rev": "85b2fe8486190fa9326565a2fb5fccb6caea4396", "type": "github" } }, diff --git a/flake.nix b/flake.nix index e90043f..8d8ebfc 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ flake = false; }; imgui = { - url = "github:ocornut/imgui/f5befd2d29e66809cd1110a152e375a7f1981f06"; + url = "github:ocornut/imgui/85b2fe8486190fa9326565a2fb5fccb6caea4396"; flake = false; }; plutosvg = { diff --git a/src/chat_gui/contact_list.cpp b/src/chat_gui/contact_list.cpp index 4ee83cd..70ecc69 100644 --- a/src/chat_gui/contact_list.cpp +++ b/src/chat_gui/contact_list.cpp @@ -309,8 +309,6 @@ bool renderContactBig( } ImGui::EndGroup(); - ImGui::SetCursorPos(post_curser_pos); - ImGui::EndGroup(); return got_selected; } diff --git a/src/start_screen.cpp b/src/start_screen.cpp index e87c939..98285fd 100644 --- a/src/start_screen.cpp +++ b/src/start_screen.cpp @@ -103,12 +103,12 @@ StartScreen::StartScreen(const std::vector& args, SDL_Renderer //fontcfg.SizePixels = 16.f*display_scale; fontcfg.SizePixels = _conf.get_int("ImGuiFonts", "size").value_or(13) * display_scale; fontcfg.RasterizerDensity = 1.f; - fontcfg.OversampleH = 2; - fontcfg.OversampleV = 1; + fontcfg.OversampleH = 0; + fontcfg.OversampleV = 0; fontcfg.MergeMode = false; #if defined(IMGUI_ENABLE_FREETYPE) && defined(IMGUI_ENABLE_FREETYPE_PLUTOSVG) std::cout << "Font: enabling freetype color loading\n"; - fontcfg.FontBuilderFlags |= ImGuiFreeTypeBuilderFlags_LoadColor; + fontcfg.FontLoaderFlags |= ImGuiFreeTypeBuilderFlags_LoadColor; #endif for (const auto [font_path, should_load] : _conf.entries_bool("ImGuiFonts", "fonts")) {