Mercurial > Gorgon / changeset

--- a/Scripts/Testing.cmake	Tue Sep 28 07:31:52 2021 +0300
+++ b/Scripts/Testing.cmake	Thu Sep 30 00:34:57 2021 +0300
@@ -38,7 +38,7 @@
 	IF(MANUAL_TEST_${file})
 		SET(target "ManualTest-${file}")
 		
-		ADD_EXECUTABLE(${target} ${CMAKE_TESTING_DIRECTORY}/Source/Manual/${file})
+		ADD_EXECUTABLE(${target} ${CMAKE_TESTING_DIRECTORY}/Source/Manual/${file}.cpp)
 		
 		SET_TARGET_PROPERTIES(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_TESTING_DIRECTORY}/Tests/Manual")
 		SET_TARGET_PROPERTIES(${target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_TESTING_DIRECTORY}/Tests/Manual")

--- a/Source/Gorgon/Widgets/Generator.cpp	Tue Sep 28 07:31:52 2021 +0300
+++ b/Source/Gorgon/Widgets/Generator.cpp	Thu Sep 30 00:34:57 2021 +0300
@@ -2425,7 +2425,6 @@
         list.SetPositioning(UI::ComponentTemplate::Absolute);
         
         return temp;
-        
     }
     
     UI::Template SimpleGenerator::Window() {
@@ -2719,13 +2718,13 @@
         };
 
         UI::Template temp = maketemplate();
-        temp.SetSpacing(spacing);
         temp.SetSize(defsize);
 
         //Main container
         temp.AddContainer(0, UI::ComponentCondition::Always)
             .AddIndex(1) //button container
             .AddIndex(2) //panel container
+            .AddIndex(5) //Button
             .SetOrientation(Graphics::Orientation::Vertical)
         ;
 
@@ -2742,7 +2741,12 @@
         buttonspanel.SetSizing(UI::ComponentTemplate::Automatic, UI::ComponentTemplate::Fixed);
 
         auto &graph = temp.AddGraphics(4, UI::ComponentCondition::Always);
+        graph.Content.SetAnimation(A(BorderFilled, Regular, None));
 
+        auto &btn = temp.AddPlaceholder(5, UI::ComponentCondition::Always);
+        btn.SetTemplate((*this)[Listbox_Regular]); // TODO replace
+        btn.SetTag(UI::ComponentTemplate::ButtonTag);
+        btn.SetPositioning(UI::ComponentTemplate::Absolute);
 
         return temp;
     }