imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-28 07:47:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Crash when clicking on the welcome screen

Browse Source
This commit is contained in:
WerWolv
2023-11-02 08:54:02 +01:00
parent 363b07fc0c
commit 4e6af607e8
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/external/imgui/source/imgui.cpp vendored
View File

@@ -7383,10 +7383,7 @@ void ImGui::BringWindowToFocusFront(ImGuiWindow* window)
IM_ASSERT(window == window->RootWindow);
const int cur_order = window->FocusOrder;
// IMHEX PATCH BEGIN
// REASON: crashes ImHex when clicking on the background on the welcome screen
//IM_ASSERT(g.WindowsFocusOrder[cur_order] == window);
// IMHEX PATCH END
IM_ASSERT(g.WindowsFocusOrder[cur_order] == window);
if (g.WindowsFocusOrder.back() == window)
return;

15
plugins/builtin/source/content/welcome_screen.cpp
View File

@@ -203,6 +203,7 @@ namespace hex::plugin::builtin {
}
// Draw recent entries
ImGui::Dummy({});
recent::draw();
if (ImHexApi::System::getInitArguments().contains("update-available")) {
@@ -324,14 +325,16 @@ namespace hex::plugin::builtin {
if (!ImHexApi::Provider::isValid()) {
static std::array<char, 256> title;
ImFormatString(title.data(), title.size(), "%s/DockSpace_%08X", ImGui::GetCurrentWindow()->Name, ImGui::GetID("ImHexMainDock"));
if (ImGui::Begin(title.data())) {
if (ImGui::Begin(title.data(), nullptr, ImGuiWindowFlags_NoNav | ImGuiWindowFlags_NoBringToFrontOnFocus)) {
ImGui::Dummy({});
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(10_scaled, 10_scaled));
ImGui::SetNextWindowScroll(ImVec2(0.0F, -1.0F));
if (ImGui::BeginChild("Welcome Screen", ImVec2(0, 0), false, ImGuiWindowFlags_AlwaysUseWindowPadding)) {
ImGui::SetNextWindowSize(ImGui::GetContentRegionAvail() + scaled({ 0, 10 }));
if (ImGui::Begin("Welcome Screen", nullptr, ImGuiWindowFlags_AlwaysUseWindowPadding | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove)) {
drawWelcomeScreenContent();
}
ImGui::EndChild();
ImGui::End();
ImGui::PopStyleVar();
}
ImGui::End();
@@ -348,7 +351,9 @@ namespace hex::plugin::builtin {
ImFormatString(title, IM_ARRAYSIZE(title), "%s/DockSpace_%08X", ImGui::GetCurrentWindow()->Name, ImGui::GetID("ImHexMainDock"));
if (ImGui::Begin(title)) {
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(10_scaled, 10_scaled));
if (ImGui::BeginChild("NoViewsBackground", ImVec2(0, 0), false, ImGuiWindowFlags_AlwaysUseWindowPadding | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse)) {
if (ImGui::Begin("NoViewsBackground", nullptr, ImGuiWindowFlags_AlwaysUseWindowPadding | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse)) {
ImGui::Dummy({});
auto imageSize = scaled(ImVec2(350, 350));
auto imagePos = (ImGui::GetContentRegionAvail() - imageSize) / 2;
@@ -368,7 +373,7 @@ namespace hex::plugin::builtin {
loadDefaultLayout();
}
}
ImGui::EndChild();
ImGui::End();
ImGui::PopStyleVar();
}
ImGui::End();