Green-Sky/tomato
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases 1 Wiki Activity

port to imgui v1.92.0
Some checks failed
ContinuousDelivery / linux-ubuntu (push) Has been cancelled
Details
ContinuousDelivery / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
Details
ContinuousDelivery / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
Details
ContinuousDelivery / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
Details
ContinuousDelivery / windows (push) Has been cancelled
Details
ContinuousDelivery / windows-asan (push) Has been cancelled
Details
ContinuousIntegration / linux (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:arm64-v8a vcpkg_toolkit:arm64-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:armeabi-v7a vcpkg_toolkit:arm-neon-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / android (map[ndk_abi:x86_64 vcpkg_toolkit:x64-android-23]) (push) Has been cancelled
Details
ContinuousIntegration / macos (push) Has been cancelled
Details
ContinuousIntegration / windows (push) Has been cancelled
Details
ContinuousDelivery / dumpsyms (push) Has been cancelled
Details
ContinuousDelivery / release (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Green Sky
2025-07-01 23:58:26 +02:00
parent 40df69d8f0
commit cfb7d22b23
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
external/imgui/CMakeLists.txt vendored
View File

@ -9,7 +9,8 @@ endif()
if (NOT TARGET imgui) if (NOT TARGET imgui)
FetchContent_Declare(imgui FetchContent_Declare(imgui
GIT_REPOSITORY https://github.com/ocornut/imgui.git 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 EXCLUDE_FROM_ALL
) )

8
flake.lock generated
View File

@ -21,17 +21,17 @@
"imgui": { "imgui": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742239046, "lastModified": 1750870001,
"narHash": "sha256-dkukDP0HD8CHC2ds0kmqy7KiGIh4148hMCyA1QF3IMo=", "narHash": "sha256-qiESah4j/yHqkOuL5BYANvZfrSqM04CqKONz1jVnkJ0=",
"owner": "ocornut", "owner": "ocornut",
"repo": "imgui", "repo": "imgui",
"rev": "f5befd2d29e66809cd1110a152e375a7f1981f06", "rev": "85b2fe8486190fa9326565a2fb5fccb6caea4396",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "ocornut", "owner": "ocornut",
"repo": "imgui", "repo": "imgui",
"rev": "f5befd2d29e66809cd1110a152e375a7f1981f06", "rev": "85b2fe8486190fa9326565a2fb5fccb6caea4396",
"type": "github" "type": "github"
} }
}, },

2
flake.nix
View File

@ -21,7 +21,7 @@
flake = false; flake = false;
}; };
imgui = { imgui = {
url = "github:ocornut/imgui/f5befd2d29e66809cd1110a152e375a7f1981f06"; url = "github:ocornut/imgui/85b2fe8486190fa9326565a2fb5fccb6caea4396";
flake = false; flake = false;
}; };
plutosvg = { plutosvg = {

2
src/chat_gui/contact_list.cpp
View File

@ -309,8 +309,6 @@ bool renderContactBig(
} }
ImGui::EndGroup(); ImGui::EndGroup();
ImGui::SetCursorPos(post_curser_pos);
ImGui::EndGroup(); ImGui::EndGroup();
return got_selected; return got_selected;
} }

6
src/start_screen.cpp
View File

@ -103,12 +103,12 @@ StartScreen::StartScreen(const std::vector<std::string_view>& args, SDL_Renderer
//fontcfg.SizePixels = 16.f*display_scale; //fontcfg.SizePixels = 16.f*display_scale;
fontcfg.SizePixels = _conf.get_int("ImGuiFonts", "size").value_or(13) * display_scale; fontcfg.SizePixels = _conf.get_int("ImGuiFonts", "size").value_or(13) * display_scale;
fontcfg.RasterizerDensity = 1.f; fontcfg.RasterizerDensity = 1.f;
fontcfg.OversampleH = 2; fontcfg.OversampleH = 0;
fontcfg.OversampleV = 1; fontcfg.OversampleV = 0;
fontcfg.MergeMode = false; fontcfg.MergeMode = false;
#if defined(IMGUI_ENABLE_FREETYPE) && defined(IMGUI_ENABLE_FREETYPE_PLUTOSVG) #if defined(IMGUI_ENABLE_FREETYPE) && defined(IMGUI_ENABLE_FREETYPE_PLUTOSVG)
std::cout << "Font: enabling freetype color loading\n"; std::cout << "Font: enabling freetype color loading\n";
fontcfg.FontBuilderFlags |= ImGuiFreeTypeBuilderFlags_LoadColor; fontcfg.FontLoaderFlags |= ImGuiFreeTypeBuilderFlags_LoadColor;
#endif #endif
for (const auto [font_path, should_load] : _conf.entries_bool("ImGuiFonts", "fonts")) { for (const auto [font_path, should_load] : _conf.entries_bool("ImGuiFonts", "fonts")) {