YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-26 12:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] fix crash due to multi-context fonts release

Browse Source
This commit is contained in:
dijunkun
2024-11-04 16:13:20 +08:00
parent 087d5d7e52
commit 44f9e6a8c9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/single_window/render.cpp
View File

@@ -498,11 +498,12 @@ int Render::SetupFontAndStyle() {
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; // Enable Docking io.ConfigFlags |= ImGuiConfigFlags_DockingEnable; // Enable Docking
// Load Fonts // Load Fonts
ImFontConfig config;
config.FontDataOwnedByAtlas = false;
io.Fonts->AddFontFromMemoryTTF(OPPOSans_Regular_ttf, io.Fonts->AddFontFromMemoryTTF(OPPOSans_Regular_ttf,
sizeof(OPPOSans_Regular_ttf), 32.0f, NULL, sizeof(OPPOSans_Regular_ttf), 32.0f, &config,
io.Fonts->GetGlyphRangesChineseFull()); io.Fonts->GetGlyphRangesChineseFull());
ImFontConfig config;
config.MergeMode = true; config.MergeMode = true;
config.GlyphMinAdvanceX = config.GlyphMinAdvanceX =
13.0f; // Use if you want to make the icon monospaced 13.0f; // Use if you want to make the icon monospaced
@@ -529,6 +530,7 @@ int Render::SetupMainWindow() {
} }
ImGui::SetCurrentContext(main_ctx_); ImGui::SetCurrentContext(main_ctx_);
SetupFontAndStyle(); SetupFontAndStyle();
SDL_GL_GetDrawableSize(main_window_, &main_window_width_real_, SDL_GL_GetDrawableSize(main_window_, &main_window_width_real_,
@@ -549,6 +551,7 @@ int Render::SetupMainWindow() {
} }
int Render::DestroyMainWindowContext() { int Render::DestroyMainWindowContext() {
ImGui::SetCurrentContext(main_ctx_);
ImGui_ImplSDLRenderer2_Shutdown(); ImGui_ImplSDLRenderer2_Shutdown();
ImGui_ImplSDL2_Shutdown(); ImGui_ImplSDL2_Shutdown();
ImGui::DestroyContext(main_ctx_); ImGui::DestroyContext(main_ctx_);
@@ -567,6 +570,7 @@ int Render::SetupStreamWindow() {
} }
ImGui::SetCurrentContext(stream_ctx_); ImGui::SetCurrentContext(stream_ctx_);
SetupFontAndStyle(); SetupFontAndStyle();
SDL_GL_GetDrawableSize(stream_window_, &stream_window_width_real_, SDL_GL_GetDrawableSize(stream_window_, &stream_window_width_real_,
@@ -591,6 +595,7 @@ int Render::SetupStreamWindow() {
int Render::DestroyStreamWindowContext() { int Render::DestroyStreamWindowContext() {
stream_window_inited_ = false; stream_window_inited_ = false;
ImGui::SetCurrentContext(stream_ctx_);
ImGui_ImplSDLRenderer2_Shutdown(); ImGui_ImplSDLRenderer2_Shutdown();
ImGui_ImplSDL2_Shutdown(); ImGui_ImplSDL2_Shutdown();
ImGui::DestroyContext(stream_ctx_); ImGui::DestroyContext(stream_ctx_);

1
src/single_window/render.h
View File

@@ -122,7 +122,6 @@ class Render {
std::mutex cd_cache_mutex_; std::mutex cd_cache_mutex_;
ConfigCenter config_center_; ConfigCenter config_center_;
ConfigCenter::LANGUAGE localization_language_ = ConfigCenter::LANGUAGE localization_language_ =
ConfigCenter::LANGUAGE::CHINESE; ConfigCenter::LANGUAGE::CHINESE;