Refactor, added clearing

LazyPanda07 · Jul 17, 2021 · 35b2972 · 35b2972
1 parent c86c445
commit 35b2972
Show file tree

Hide file tree

Showing 16 changed files with 53 additions and 32 deletions.
diff --git a/GUIFramework/GUIFramework.vcxproj b/GUIFramework/GUIFramework.vcxproj
@@ -162,10 +162,10 @@
     <ClInclude Include="src\Styles\Composites\DialogBoxStyles.h" />
     <ClInclude Include="src\Styles\Composites\SeparateWindowStyles.h" />
     <ClInclude Include="src\Styles\DefaultStyles.h" />
-    <ClInclude Include="src\Utility\Holders\BaseLoadableHolder.h" />
-    <ClInclude Include="src\Utility\Holders\CursorsHolder.h" />
-    <ClInclude Include="src\Utility\Holders\IconsHolder.h" />
-    <ClInclude Include="src\Utility\Holders\ImagesHolder.h" />
+    <ClInclude Include="src\Utility\Holders\LoadableHolders\BaseLoadableHolder.h" />
+    <ClInclude Include="src\Utility\Holders\LoadableHolders\CursorsHolder.h" />
+    <ClInclude Include="src\Utility\Holders\LoadableHolders\IconsHolder.h" />
+    <ClInclude Include="src\Utility\Holders\LoadableHolders\ImagesHolder.h" />
     <ClInclude Include="src\Interfaces\Components\IResizableComponent.h" />
     <ClInclude Include="src\Interfaces\Components\ITextOperations.h" />
     <ClInclude Include="src\Interfaces\Iterators\IBaseConstForwardIterator.h" />
@@ -181,7 +181,7 @@
     <ClInclude Include="src\Utility\ComponentSettings.h" />
     <ClInclude Include="src\Utility\Paint\DrawImage.h" />
     <ClInclude Include="src\Utility\Utility.h" />
-    <ClInclude Include="src\WindowHolder.h" />
+    <ClInclude Include="src\Utility\Holders\WindowHolder.h" />
     <ClInclude Include="src\WindowMessages.h" />
   </ItemGroup>
   <ItemGroup>
@@ -316,10 +316,10 @@
     <ClCompile Include="src\Styles\Composites\DialogBoxStyles.cpp" />
     <ClCompile Include="src\Styles\Composites\SeparateWindowStyles.cpp" />
     <ClCompile Include="src\Styles\DefaultStyles.cpp" />
-    <ClCompile Include="src\Utility\Holders\BaseLoadableHolder.cpp" />
-    <ClCompile Include="src\Utility\Holders\CursorsHolder.cpp" />
-    <ClCompile Include="src\Utility\Holders\IconsHolder.cpp" />
-    <ClCompile Include="src\Utility\Holders\ImagesHolder.cpp" />
+    <ClCompile Include="src\Utility\Holders\LoadableHolders\BaseLoadableHolder.cpp" />
+    <ClCompile Include="src\Utility\Holders\LoadableHolders\CursorsHolder.cpp" />
+    <ClCompile Include="src\Utility\Holders\LoadableHolders\IconsHolder.cpp" />
+    <ClCompile Include="src\Utility\Holders\LoadableHolders\ImagesHolder.cpp" />
     <ClCompile Include="src\Interfaces\Components\IResizableComponent.cpp" />
     <ClCompile Include="src\Interfaces\Components\ITextOperations.cpp" />
     <ClCompile Include="src\Interfaces\Menu\IMenuItem.cpp" />
@@ -332,7 +332,7 @@
     <ClCompile Include="src\Utility\ComponentSettings.cpp" />
     <ClCompile Include="src\Utility\Paint\DrawImage.cpp" />
     <ClCompile Include="src\Utility\Utility.cpp" />
-    <ClCompile Include="src\WindowHolder.cpp" />
+    <ClCompile Include="src\Utility\Holders\WindowHolder.cpp" />
   </ItemGroup>
   <ItemGroup>
     <None Include="GUIFrameworkMacros.props" />

diff --git a/GUIFramework/GUIFramework.vcxproj.filters b/GUIFramework/GUIFramework.vcxproj.filters
@@ -240,7 +240,7 @@
     <ClInclude Include="src\BaseComponents\Creators\TabControlCreator.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\WindowHolder.h">
+    <ClInclude Include="src\Utility\Holders\WindowHolder.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
     <ClInclude Include="src\Exceptions\NotImplemented.h">
@@ -249,7 +249,7 @@
     <ClInclude Include="src\BaseComponents\StandardComponents\ListViews\BaseListView.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\Utility\Holders\ImagesHolder.h">
+    <ClInclude Include="src\Utility\Holders\LoadableHolders\ImagesHolder.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
     <ClInclude Include="src\BaseComponents\StandardComponents\ListViews\BaseTextListView.h">
@@ -285,13 +285,13 @@
     <ClInclude Include="src\BaseComponents\StandardComponents\ListViews\BaseListTextIconListView.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\Utility\Holders\BaseLoadableHolder.h">
+    <ClInclude Include="src\Utility\Holders\LoadableHolders\BaseLoadableHolder.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\Utility\Holders\IconsHolder.h">
+    <ClInclude Include="src\Utility\Holders\LoadableHolders\IconsHolder.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
-    <ClInclude Include="src\Utility\Holders\CursorsHolder.h">
+    <ClInclude Include="src\Utility\Holders\LoadableHolders\CursorsHolder.h">
       <Filter>Файлы заголовков</Filter>
     </ClInclude>
     <ClInclude Include="src\Components\ListViews\IconListView.h">
@@ -686,7 +686,7 @@
     <ClCompile Include="src\BaseComponents\Creators\TabControlCreator.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\WindowHolder.cpp">
+    <ClCompile Include="src\Utility\Holders\WindowHolder.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
     <ClCompile Include="src\Exceptions\NotImplemented.cpp">
@@ -695,7 +695,7 @@
     <ClCompile Include="src\BaseComponents\StandardComponents\ListViews\BaseListView.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\Utility\Holders\ImagesHolder.cpp">
+    <ClCompile Include="src\Utility\Holders\LoadableHolders\ImagesHolder.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
     <ClCompile Include="src\BaseComponents\StandardComponents\ListViews\BaseTextListView.cpp">
@@ -731,13 +731,13 @@
     <ClCompile Include="src\BaseComponents\StandardComponents\ListViews\BaseListTextIconListView.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\Utility\Holders\BaseLoadableHolder.cpp">
+    <ClCompile Include="src\Utility\Holders\LoadableHolders\BaseLoadableHolder.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\Utility\Holders\IconsHolder.cpp">
+    <ClCompile Include="src\Utility\Holders\LoadableHolders\IconsHolder.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
-    <ClCompile Include="src\Utility\Holders\CursorsHolder.cpp">
+    <ClCompile Include="src\Utility\Holders\LoadableHolders\CursorsHolder.cpp">
       <Filter>Исходные файлы</Filter>
     </ClCompile>
     <ClCompile Include="src\Components\ListViews\IconListView.cpp">

diff --git a/GUIFramework/src/BaseComponents/StandardComponents/BaseTabControl.h b/GUIFramework/src/BaseComponents/StandardComponents/BaseTabControl.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "BaseComponents/BaseComponent.h"
-#include "Utility/Holders/ImagesHolder.h"
+#include "Utility/Holders/LoadableHolders/ImagesHolder.h"
 
 namespace gui_framework
 {

diff --git a/GUIFramework/src/Interfaces/Components/ListViews/IIconListView.h b/GUIFramework/src/Interfaces/Components/ListViews/IIconListView.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "IBaseListViewOperations.h"
-#include "Utility/Holders/IconsHolder.h"
+#include "Utility/Holders/LoadableHolders/IconsHolder.h"
 
 namespace gui_framework
 {

diff --git a/GUIFramework/src/Interfaces/Components/ListViews/ITextIconListView.h b/GUIFramework/src/Interfaces/Components/ListViews/ITextIconListView.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "IBaseListViewOperations.h"
-#include "Utility/Holders/IconsHolder.h"
+#include "Utility/Holders/LoadableHolders/IconsHolder.h"
 
 namespace gui_framework
 {

diff --git a/...rc/Utility/Holders/BaseLoadableHolder.cpp → ...rs/LoadableHolders/BaseLoadableHolder.cpp b/...rc/Utility/Holders/BaseLoadableHolder.cpp → ...rs/LoadableHolders/BaseLoadableHolder.cpp
diff --git a/.../src/Utility/Holders/BaseLoadableHolder.h → ...ders/LoadableHolders/BaseLoadableHolder.h b/.../src/Utility/Holders/BaseLoadableHolder.h → ...ders/LoadableHolders/BaseLoadableHolder.h
diff --git a/...ork/src/Utility/Holders/CursorsHolder.cpp → ...Holders/LoadableHolders/CursorsHolder.cpp b/...ork/src/Utility/Holders/CursorsHolder.cpp → ...Holders/LoadableHolders/CursorsHolder.cpp
diff --git a/...ework/src/Utility/Holders/CursorsHolder.h → ...y/Holders/LoadableHolders/CursorsHolder.h b/...ework/src/Utility/Holders/CursorsHolder.h → ...y/Holders/LoadableHolders/CursorsHolder.h
diff --git a/...ework/src/Utility/Holders/IconsHolder.cpp → ...y/Holders/LoadableHolders/IconsHolder.cpp b/...ework/src/Utility/Holders/IconsHolder.cpp → ...y/Holders/LoadableHolders/IconsHolder.cpp
diff --git a/...amework/src/Utility/Holders/IconsHolder.h → ...ity/Holders/LoadableHolders/IconsHolder.h b/...amework/src/Utility/Holders/IconsHolder.h → ...ity/Holders/LoadableHolders/IconsHolder.h
diff --git a/...work/src/Utility/Holders/ImagesHolder.cpp → .../Holders/LoadableHolders/ImagesHolder.cpp b/...work/src/Utility/Holders/ImagesHolder.cpp → .../Holders/LoadableHolders/ImagesHolder.cpp
diff --git a/...mework/src/Utility/Holders/ImagesHolder.h → ...ty/Holders/LoadableHolders/ImagesHolder.h b/...mework/src/Utility/Holders/ImagesHolder.h → ...ty/Holders/LoadableHolders/ImagesHolder.h
diff --git a/GUIFramework/src/WindowHolder.cpp → ...work/src/Utility/Holders/WindowHolder.cpp b/GUIFramework/src/WindowHolder.cpp → ...work/src/Utility/Holders/WindowHolder.cpp
@@ -7,8 +7,9 @@ using namespace std;
 
 namespace gui_framework
 {
-	WindowHolder::WindowHolder(unique_ptr<BaseComposite>&& compositeWindow) noexcept :
-		compositeWindow(move(compositeWindow))
+	WindowHolder::WindowHolder(unique_ptr<BaseComposite>&& compositeWindow, bool unregisterClass) noexcept :
+		compositeWindow(move(compositeWindow)),
+		unregisterClass(unregisterClass)
 	{
 
 	}
@@ -23,7 +24,7 @@ namespace gui_framework
 		return compositeWindow.get();
 	}
 
-	void WindowHolder::runMainLoop()
+	void WindowHolder::runMainLoop(const vector<uint32_t>& registeredHotkeyIds)
 	{
 		MSG message = {};
 		int code;
@@ -40,9 +41,24 @@ namespace gui_framework
 			DispatchMessageW(&message);
 		}
 
+		GUIFramework& instance = GUIFramework::get();
+
+		for (const auto& i : registeredHotkeyIds)
+		{
+			instance.unregisterHotkey(i);
+		}
+
 		if (code == -1)
 		{
 			throw exceptions::GetLastErrorException(code);
 		}
 	}
+
+	WindowHolder::~WindowHolder()
+	{
+		if (unregisterClass)
+		{
+			utility::unregisterClass(compositeWindow->getClassName());
+		}
+	}
 }
diff --git a/GUIFramework/src/WindowHolder.h → ...mework/src/Utility/Holders/WindowHolder.h b/GUIFramework/src/WindowHolder.h → ...mework/src/Utility/Holders/WindowHolder.h
@@ -9,9 +9,13 @@ namespace gui_framework
 	{
 	private:
 		std::unique_ptr<BaseComposite> compositeWindow;
+		bool unregisterClass;
 
 	public:
-		WindowHolder(std::unique_ptr<BaseComposite>&& compositeWindow) noexcept;
+		/// @brief 
+		/// @param compositeWindow 
+		/// @param clearClass Unregister class after window destroy
+		WindowHolder(std::unique_ptr<BaseComposite>&& compositeWindow, bool unregisterClass = false) noexcept;
 
 		template<std::derived_from<BaseComposite> T>
 		T* getDerived();
@@ -23,11 +27,12 @@ namespace gui_framework
 
 		const BaseComposite* get() const;
 
-		/// @brief 
-		/// @exception GetLastErrorException
-		void runMainLoop();
+		/// @brief Process messages. Must be called after initialization
+		/// @param registeredHotkeyIds You may pass all registered hotkeys for unregister them after window destroy
+		/// @exception GetLastErrorException 
+		void runMainLoop(const std::vector<uint32_t>& registeredHotkeyIds = {});
 
-		~WindowHolder() = default;
+		~WindowHolder();
 	};
 
 	template<std::derived_from<BaseComposite> T>

diff --git a/GUIFramework/src/Utility/Paint/DrawImage.h b/GUIFramework/src/Utility/Paint/DrawImage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utility/Holders/BaseLoadableHolder.h"
+#include "Utility/Holders/LoadableHolders/BaseLoadableHolder.h"
 #include "BaseComposites/StandardComposites/BaseWindow.h"
 
 namespace gui_framework