imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 05:27:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Updated ImGui to v1.91.5

Browse Source
This commit is contained in:
WerWolv
2024-11-24 18:55:56 +01:00
parent ded8cff415
commit fe9eecd031
24 changed files with 2499 additions and 1820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/gui/source/init/splash_window.cpp
View File

@@ -526,7 +526,7 @@ namespace hex::init {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, w, h, 0, GL_ALPHA, GL_UNSIGNED_BYTE, px);
io.Fonts->SetTexID(reinterpret_cast<ImTextureID>(tex));
io.Fonts->SetTexID(tex);
}
// Don't save window settings for the splash screen

3
main/gui/source/window/window.cpp
View File

@@ -200,7 +200,6 @@ namespace hex {
}
// Try to recover from the exception by bringing ImGui back into a working state
ImGui::ErrorCheckEndFrameRecover(errorRecoverLogCallback, nullptr);
ImGui::EndFrame();
ImGui::UpdatePlatformWindows();
@@ -663,8 +662,6 @@ namespace hex {
this->endNativeWindowFrame();
ImGui::ErrorCheckEndFrameRecover(errorRecoverLogCallback, nullptr);
// Finalize ImGui frame
ImGui::Render();