[editor] moved all widgets from WidgetsDeferred into Widgets since th…

…e separation of the two serves nothing
PanosK92 · Oct 29, 2024 · 03cd76c · 03cd76c
1 parent 37a4de0
commit 03cd76c
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 19 deletions.
diff --git a/editor/ImGui/ImGuiExtension.h b/editor/ImGui/ImGuiExtension.h
@@ -21,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-//= INCLUDES =============================
+//= INCLUDES ======================
 #include <string>
 #include <variant>
 #include "Window.h"
@@ -34,8 +34,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "Display/Display.h"
 #include "Source/imgui_internal.h"
 #include "../Editor.h"
-#include "../WidgetsDeferred/IconLoader.h"
-//========================================
+#include "../Widgets/IconLoader.h"
+//=================================
 
 class EditorHelper
 {

diff --git a/editor/Widgets/AssetBrowser.cpp b/editor/Widgets/AssetBrowser.cpp
@@ -19,13 +19,13 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-//= INCLUDES =============================
+//= INCLUDES =====================
 #include "AssetBrowser.h"
 #include "Properties.h"
 #include "Rendering/Mesh.h"
-#include "../WidgetsDeferred/FileDialog.h"
+#include "../Widgets/FileDialog.h"
 #include "Viewport.h"
-//========================================
+//================================
 
 //= NAMESPACES =========
 using namespace std;

diff --git a/editor/WidgetsDeferred/ButtonColorPicker.cpp → editor/Widgets/ButtonColorPicker.cpp b/editor/WidgetsDeferred/ButtonColorPicker.cpp → editor/Widgets/ButtonColorPicker.cpp
diff --git a/editor/WidgetsDeferred/ButtonColorPicker.h → editor/Widgets/ButtonColorPicker.h b/editor/WidgetsDeferred/ButtonColorPicker.h → editor/Widgets/ButtonColorPicker.h
diff --git a/editor/WidgetsDeferred/FileDialog.cpp → editor/Widgets/FileDialog.cpp b/editor/WidgetsDeferred/FileDialog.cpp → editor/Widgets/FileDialog.cpp
diff --git a/editor/WidgetsDeferred/FileDialog.h → editor/Widgets/FileDialog.h b/editor/WidgetsDeferred/FileDialog.h → editor/Widgets/FileDialog.h
diff --git a/editor/WidgetsDeferred/IconLoader.cpp → editor/Widgets/IconLoader.cpp b/editor/WidgetsDeferred/IconLoader.cpp → editor/Widgets/IconLoader.cpp
diff --git a/editor/WidgetsDeferred/IconLoader.h → editor/Widgets/IconLoader.h b/editor/WidgetsDeferred/IconLoader.h → editor/Widgets/IconLoader.h
diff --git a/editor/Widgets/Properties.cpp b/editor/Widgets/Properties.cpp
@@ -19,13 +19,13 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-//= INCLUDES ====================================
+//= INCLUDES ===================================
 #include "Properties.h"
 #include "Window.h"
 #include "../ImGui/ImGuiExtension.h"
 #include "../ImGui/Implementation/ImGui_Style.h"
 #include "../ImGui/Source/imgui_stdlib.h"
-#include "../WidgetsDeferred/ButtonColorPicker.h"
+#include "../Widgets/ButtonColorPicker.h"
 #include "Core/Engine.h"
 #include "World/Entity.h"
 #include "World/Components/Renderable.h"
@@ -37,7 +37,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "World/Components/Terrain.h"
 #include "World/Components/Camera.h"
 #include "Rendering/Mesh.h"
-//===============================================
+//==============================================
 
 //= NAMESPACES =========
 using namespace std;

diff --git a/editor/Widgets/Properties.h b/editor/Widgets/Properties.h
@@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-//= INCLUDES ====================================
+//= INCLUDES ============================
 #include "Widget.h"
 #include <memory>
-#include "../WidgetsDeferred/ButtonColorPicker.h"
-//===============================================
+#include "../Widgets/ButtonColorPicker.h"
+//=======================================
 
 namespace Spartan
 {

diff --git a/editor/Widgets/ShaderEditor.h b/editor/Widgets/ShaderEditor.h
@@ -21,11 +21,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #pragma once
 
-//= INCLUDES =============================
+//= INCLUDES =====================
 #include "Widget.h"
 #include <vector>
-#include "../WidgetsDeferred/TextEditor.h"
-//========================================
+#include "../Widgets/TextEditor.h"
+//================================
 
 namespace Spartan
 {

diff --git a/editor/WidgetsDeferred/TextEditor.cpp → editor/Widgets/TextEditor.cpp b/editor/WidgetsDeferred/TextEditor.cpp → editor/Widgets/TextEditor.cpp
diff --git a/editor/WidgetsDeferred/TextEditor.h → editor/Widgets/TextEditor.h b/editor/WidgetsDeferred/TextEditor.h → editor/Widgets/TextEditor.h
diff --git a/editor/Widgets/TitleBar.cpp b/editor/Widgets/TitleBar.cpp
@@ -19,7 +19,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-//= INCLUDES =============================
+//= INCLUDES =====================
 #include "TitleBar.h"
 #include "../EditorWindow.h"
 #include "Profiler.h"
@@ -32,13 +32,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "Properties.h"
 #include "Viewport.h"
 #include "WorldViewer.h"
-#include "../WidgetsDeferred/FileDialog.h"
+#include "../Widgets/FileDialog.h"
 #include "Engine.h"
 #include "Profiling/RenderDoc.h"
 #include <Debugging.h>
 #include "Style.h"
-#include <Input/Input.h>
-//========================================
+//================================
 
 //= NAMESPACES =====
 using namespace std;