[FIX] : fix the display of error/warning pane

aiekick · Jul 21, 2024 · 55d99cd · 55d99cd
1 parent 55b52db
commit 55d99cd
Show file tree

Hide file tree

Showing 8 changed files with 251 additions and 275 deletions.
diff --git a/3rdparty/SoGLSL b/3rdparty/SoGLSL
diff --git a/src/Backends/MainBackend.h b/src/Backends/MainBackend.h
@@ -21,8 +21,8 @@
 #include <Headers/RenderPackHeaders.h>
 #include <Gui/GuiBackend.h>
 #include <Renderer/RenderPack.h>
-#include <Systems/Interfaces/MouseInterface.h>
-#include <Systems/Interfaces/CameraInterface.h>
+#include <Interfaces/MouseInterface.h>
+#include <Interfaces/CameraInterface.h>
 
 #include <unordered_set>
 #include <string>

diff --git a/src/Gui/MainFrame.cpp b/src/Gui/MainFrame.cpp
@@ -264,7 +264,7 @@ void MainFrame::Display(ct::ivec2 vSize) {
         SettingsDlg::Instance()->DrawDialog();
         VersionSystem::Instance()->DrawNewVersionDialog();
         ShadertoyBackupFileImportDlg::Instance()->DrawDialog();
-        LayoutManager::Instance()->DrawDialogsAndPopups(0U, size);
+        LayoutManager::Instance()->DrawDialogsAndPopups(0U, ImRect(ImVec2(), size));
 
         DrawErrorDialog();
         DoAbout();

diff --git a/src/Gui/MainToolBar.cpp b/src/Gui/MainToolBar.cpp
diff --git a/src/Headers/NoodlesPlateBuild.h b/src/Headers/NoodlesPlateBuild.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define NoodlesPlate_Prefix "NoodlesPlate"
-#define NoodlesPlate_BuildNumber 782
+#define NoodlesPlate_BuildNumber 786
 #define NoodlesPlate_MinorNumber 7
 #define NoodlesPlate_MajorNumber 0
-#define NoodlesPlate_BuildId "0.7.782"
+#define NoodlesPlate_BuildId "0.7.786"
diff --git a/src/Panes/ConfigSwitcherPane.cpp b/src/Panes/ConfigSwitcherPane.cpp
@@ -94,7 +94,7 @@ bool ConfigSwitcherPane::DrawPanes(const uint32_t& /*vCurrentFrame*/, bool* vOpe
 	return false;
 }
 
-bool ConfigSwitcherPane::DrawDialogsAndPopups(const uint32_t& /*vCurrentFrame*/, const ImVec2& /*vMaxSize*/, ImGuiContext* /*vContextPtr*/, void* /*vUserDatas*/) {
+bool ConfigSwitcherPane::DrawDialogsAndPopups(const uint32_t& /*vCurrentFrame*/, const ImRect& vMaxRect /*vMaxSize*/, ImGuiContext* /*vContextPtr*/, void* /*vUserDatas*/) {
     ShaderKeyConfigSwitcherUnified::Instance()->DrawDialog();
     return false;
 }

diff --git a/src/Panes/ConfigSwitcherPane.h b/src/Panes/ConfigSwitcherPane.h
@@ -28,7 +28,7 @@ class ConfigSwitcherPane : public AbstractPane, public conf::ConfigAbstract
 	bool Init() override;
 	void Unit() override;
 	bool DrawPanes(const uint32_t& /*vCurrentFrame*/, bool* vOpened, ImGuiContext* /*vContextPtr*/ = nullptr, void* vUserDatas = nullptr) override;
-    bool DrawDialogsAndPopups(const uint32_t& /*vCurrentFrame*/, const ImVec2& vMaxSize, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
+    bool DrawDialogsAndPopups(const uint32_t& /*vCurrentFrame*/, const ImRect& vMaxRect, ImGuiContext* vContextPtr = nullptr, void* vUserDatas = nullptr) override;
 
 	// configuration
 	std::string getXml(const std::string& vOffset, const std::string& vUserDatas = "") override;
+1 −1		3rdparty/ImGuiPack
+1 −1		3rdparty/InAppGpuProfiler
+1 −1		3rdparty/ctools
+16 −16		cmake/Maintained/iagp.cmake
+1 −1		src/Buffer/FrameBufferAttachment.cpp
+1 −1		src/Mesh/Model/PNCMesh.cpp
+1 −1		src/Mesh/Model/PNCModel.cpp
+1 −1		src/Mesh/Model/PNTBTCMesh.cpp
+1 −1		src/Mesh/Model/PNTBTCModel.cpp
+1 −1		src/Mesh/Model/PNTCModel.cpp
+1 −1		src/Mesh/Model/PointModel.cpp
+1 −1		src/Mesh/Model/QuadModel.cpp
+1 −1		src/Renderer/RenderPack.cpp
+1 −1		src/Uniforms/UniformHelper.cpp
+1 −1		src/VR/Backend/VRBackend.cpp