Fixed random crashing issue
This commit is contained in:
@@ -14,6 +14,7 @@ namespace anm2ed::imgui
|
|||||||
|
|
||||||
auto viewport = ImGui::GetMainViewport();
|
auto viewport = ImGui::GetMainViewport();
|
||||||
auto windowHeight = viewport->Size.y - taskbar.height - documents.height;
|
auto windowHeight = viewport->Size.y - taskbar.height - documents.height;
|
||||||
|
if (windowHeight < 1.0f) windowHeight = 1.0f;
|
||||||
|
|
||||||
ImGui::SetNextWindowViewport(viewport->ID);
|
ImGui::SetNextWindowViewport(viewport->ID);
|
||||||
ImGui::SetNextWindowPos(ImVec2(viewport->Pos.x, viewport->Pos.y + taskbar.height + documents.height));
|
ImGui::SetNextWindowPos(ImVec2(viewport->Pos.x, viewport->Pos.y + taskbar.height + documents.height));
|
||||||
|
|||||||
@@ -898,14 +898,11 @@ namespace anm2ed::imgui
|
|||||||
|
|
||||||
ImGui::EndPopup();
|
ImGui::EndPopup();
|
||||||
}
|
}
|
||||||
ImGui::End();
|
|
||||||
|
|
||||||
manager.progressPopup.trigger();
|
manager.progressPopup.trigger();
|
||||||
|
|
||||||
if (ImGui::BeginPopupModal(manager.progressPopup.label(), &manager.progressPopup.isOpen, ImGuiWindowFlags_NoResize))
|
if (ImGui::BeginPopupModal(manager.progressPopup.label(), &manager.progressPopup.isOpen, ImGuiWindowFlags_NoResize))
|
||||||
{
|
{
|
||||||
if (!animation) return;
|
|
||||||
|
|
||||||
auto& start = manager.recordingStart;
|
auto& start = manager.recordingStart;
|
||||||
auto& end = manager.recordingEnd;
|
auto& end = manager.recordingEnd;
|
||||||
auto progress = (playback.time - start) / (end - start);
|
auto progress = (playback.time - start) / (end - start);
|
||||||
@@ -946,5 +943,6 @@ namespace anm2ed::imgui
|
|||||||
}
|
}
|
||||||
|
|
||||||
settings.previewStartZoom = zoom;
|
settings.previewStartZoom = zoom;
|
||||||
|
ImGui::End();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -466,7 +466,7 @@ namespace anm2ed::imgui
|
|||||||
|
|
||||||
ImGui::EndPopup();
|
ImGui::EndPopup();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -518,7 +518,6 @@ namespace anm2ed::imgui
|
|||||||
|
|
||||||
ImGui::EndPopup();
|
ImGui::EndPopup();
|
||||||
}
|
}
|
||||||
ImGui::End();
|
|
||||||
|
|
||||||
if (!document.isSpritesheetEditorSet)
|
if (!document.isSpritesheetEditorSet)
|
||||||
{
|
{
|
||||||
@@ -532,5 +531,6 @@ namespace anm2ed::imgui
|
|||||||
|
|
||||||
settings.editorSize = size;
|
settings.editorSize = size;
|
||||||
settings.editorStartZoom = zoom;
|
settings.editorStartZoom = zoom;
|
||||||
|
ImGui::End();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ namespace anm2ed::imgui
|
|||||||
{
|
{
|
||||||
auto viewport = ImGui::GetMainViewport();
|
auto viewport = ImGui::GetMainViewport();
|
||||||
auto windowHeight = viewport->Size.y - taskbar.height - documents.height;
|
auto windowHeight = viewport->Size.y - taskbar.height - documents.height;
|
||||||
|
if (windowHeight < 1.0f)
|
||||||
|
windowHeight = 1.0f;
|
||||||
|
|
||||||
ImGui::SetNextWindowViewport(viewport->ID);
|
ImGui::SetNextWindowViewport(viewport->ID);
|
||||||
ImGui::SetNextWindowPos(ImVec2(viewport->Pos.x, viewport->Pos.y + taskbar.height + documents.height));
|
ImGui::SetNextWindowPos(ImVec2(viewport->Pos.x, viewport->Pos.y + taskbar.height + documents.height));
|
||||||
|
|||||||
@@ -2,6 +2,8 @@
|
|||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
|
#include <imgui/imgui_internal.h>
|
||||||
|
|
||||||
#include <imgui/backends/imgui_impl_opengl3.h>
|
#include <imgui/backends/imgui_impl_opengl3.h>
|
||||||
#include <imgui/backends/imgui_impl_sdl3.h>
|
#include <imgui/backends/imgui_impl_sdl3.h>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user