From 99b90496765df21c5f377f42b9ed073ccb34c1fd Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Thu, 1 Aug 2019 09:15:04 +0800
Subject: *misc

---
 Build/Asura.Editor/Asura.Editor.vcxproj         |  29 ++----
 Build/Asura.Editor/Asura.Editor.vcxproj.filters | 128 +++++++++---------------
 2 files changed, 55 insertions(+), 102 deletions(-)

(limited to 'Build/Asura.Editor')

diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj b/Build/Asura.Editor/Asura.Editor.vcxproj
index 38c60a7..72dc736 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj
@@ -117,22 +117,17 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\binding\_button.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\controls\button.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\controls\checkbox.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\controls\hslider.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\controls\hvslider.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\content.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\controls\label.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\controls\menu_item.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\controls\toggle.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\controls\panel.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\controls\progress.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\controls\radio_button.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\controls\textbox.cpp" />
-    <ClCompile Include="..\..\source\Asura.Editor\controls\vslider.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\editor.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\graphics\brush.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\graphics\drawer.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\graphics\draw_info.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\graphics\slider.cpp" />
+    <ClCompile Include="..\..\source\Asura.Editor\graphics\style.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\graphics\pen.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\layout\horizontal_layout.cpp" />
     <ClCompile Include="..\..\source\Asura.Editor\layout\vertical_layout.cpp" />
@@ -143,23 +138,17 @@
   <ItemGroup>
     <ClInclude Include="..\..\source\Asura.Editor\config.h" />
     <ClInclude Include="..\..\source\Asura.Editor\controls\button.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\controls\checkbox.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\controls\hslider.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\controls\hvslider.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\content.h" />
     <ClInclude Include="..\..\source\Asura.Editor\controls\label.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\controls\menu_item.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\controls\toggle.h" />
     <ClInclude Include="..\..\source\Asura.Editor\controls\panel.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\controls\progress.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\controls\radio_button.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\controls\textbox.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\controls\vslider.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\controls\widget.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\core\slot.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\core\signal.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\core\gui_state.h" />
     <ClInclude Include="..\..\source\Asura.Editor\editor.h" />
     <ClInclude Include="..\..\source\Asura.Editor\graphics\brush.h" />
     <ClInclude Include="..\..\source\Asura.Editor\graphics\drawer.h" />
     <ClInclude Include="..\..\source\Asura.Editor\graphics\draw_info.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\graphics\slider.h" />
+    <ClInclude Include="..\..\source\Asura.Editor\graphics\style.h" />
     <ClInclude Include="..\..\source\Asura.Editor\graphics\pen.h" />
     <ClInclude Include="..\..\source\Asura.Editor\graphics\shader.h" />
     <ClInclude Include="..\..\source\Asura.Editor\graphics\shaders\image.shader.h" />
diff --git a/Build/Asura.Editor/Asura.Editor.vcxproj.filters b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
index be12ded..0e979a4 100644
--- a/Build/Asura.Editor/Asura.Editor.vcxproj.filters
+++ b/Build/Asura.Editor/Asura.Editor.vcxproj.filters
@@ -10,18 +10,15 @@
     <Filter Include="system">
       <UniqueIdentifier>{48600309-cddd-49cd-b939-7a19a2b1eaa3}</UniqueIdentifier>
     </Filter>
-    <Filter Include="controls">
-      <UniqueIdentifier>{a4345092-d09c-424c-8d7c-c076914fb6a2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="controls\binding">
-      <UniqueIdentifier>{1e378398-d7f0-4616-a986-b6a86faeaa8c}</UniqueIdentifier>
-    </Filter>
     <Filter Include="graphics">
       <UniqueIdentifier>{4be8ce5c-0921-4341-a976-92d31aa84c8c}</UniqueIdentifier>
     </Filter>
     <Filter Include="graphics\shaders">
       <UniqueIdentifier>{b4c26f9c-9f4e-4332-a6e2-33456b4abecb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="controls">
+      <UniqueIdentifier>{a236e36b-9b74-48a2-a4c9-f70dbb321f14}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\source\Asura.Editor\layout\horizontal_layout.cpp">
@@ -35,56 +32,41 @@
     <ClCompile Include="..\..\source\Asura.Editor\system\file_watcher.cpp">
       <Filter>system</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\button.cpp">
-      <Filter>controls</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\graphics\drawer.cpp">
+      <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\checkbox.cpp">
-      <Filter>controls</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\graphics\draw_info.cpp">
+      <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\hslider.cpp">
-      <Filter>controls</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\graphics\brush.cpp">
+      <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\hvslider.cpp">
-      <Filter>controls</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\graphics\pen.cpp">
+      <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\label.cpp">
-      <Filter>controls</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\system\editor_window.cpp">
+      <Filter>system</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\panel.cpp">
-      <Filter>controls</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\graphics\style.cpp">
+      <Filter>graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\progress.cpp">
+    <ClCompile Include="..\..\source\Asura.Editor\controls\button.cpp">
       <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\radio_button.cpp">
+    <ClCompile Include="..\..\source\Asura.Editor\controls\content.cpp">
       <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\textbox.cpp">
+    <ClCompile Include="..\..\source\Asura.Editor\controls\label.cpp">
       <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\vslider.cpp">
+    <ClCompile Include="..\..\source\Asura.Editor\controls\toggle.cpp">
       <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\binding\_button.cpp">
-      <Filter>controls\binding</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\controls\menu_item.cpp">
+    <ClCompile Include="..\..\source\Asura.Editor\controls\panel.cpp">
       <Filter>controls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\graphics\drawer.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\graphics\draw_info.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\graphics\brush.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\graphics\pen.cpp">
-      <Filter>graphics</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\source\Asura.Editor\system\editor_window.cpp">
-      <Filter>system</Filter>
+    <ClCompile Include="..\..\source\Asura.Editor\graphics\slider.cpp">
+      <Filter>controls</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -95,51 +77,9 @@
       <Filter>layout</Filter>
     </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\editor.h" />
-    <ClInclude Include="..\..\source\Asura.Editor\core\signal.h">
-      <Filter>core</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\core\slot.h">
-      <Filter>core</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\system\file_watcher.h">
       <Filter>system</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\button.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\checkbox.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\hslider.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\hvslider.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\label.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\panel.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\progress.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\radio_button.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\textbox.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\vslider.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\widget.h">
-      <Filter>controls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\source\Asura.Editor\controls\menu_item.h">
-      <Filter>controls</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\source\Asura.Editor\config.h" />
     <ClInclude Include="..\..\source\Asura.Editor\type.h" />
     <ClInclude Include="..\..\source\Asura.Editor\graphics\drawer.h">
@@ -166,5 +106,29 @@
     <ClInclude Include="..\..\source\Asura.Editor\system\editor_window.h">
       <Filter>system</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\core\gui_state.h">
+      <Filter>core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\graphics\style.h">
+      <Filter>graphics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\button.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\content.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\label.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\toggle.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\controls\panel.h">
+      <Filter>controls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\source\Asura.Editor\graphics\slider.h">
+      <Filter>controls</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
-- 
cgit v1.1-26-g67d0