Removed default_theme namespace

inc/hgl/gui/ThemeForm.h

@@ -24,13 +24,14 @@ namespace hgl
             ThemeForm(Form *,RenderTarget *,RenderCommand *);
             virtual ~ThemeForm();
 
-            RenderTarget *  GetRenderTarget(){return render_target;}
+                    RenderTarget *  GetRenderTarget(){return render_target;}
-            bool            SetRenderTarget(RenderTarget *);
+                    bool            SetRenderTarget(RenderTarget *);
 
-            void            Resize(uint w,uint h);
+                    void            Resize(uint w,uint h);
 
-            bool            BeginRender();
+                    bool            BeginRender();
-            bool            EndRender();
+            virtual bool            Render()=0;
+                    bool            EndRender();
         };//class ThemeForm
     }//namespace gui
 }//namespace hgl

src/GUI/CMakeLists.txt

@@ -7,8 +7,8 @@ SET(THEME_SOURCE    ${GUI_INCLUDE_PATH}/ThemeForm.h
 
 SET(DEFAULT_THEME_SOURCE    DefaultThemeEngine.h
                             DefaultThemeEngine.cpp
-                            DTForm.h
+                            DefaultThemeForm.h
-                            DTForm.cpp)
+                            DefaultThemeForm.cpp)
 
 set(WIDGET_SOURCE   ${GUI_INCLUDE_PATH}/Widget.h
                     ${GUI_INCLUDE_PATH}/Layout.h

src/GUI/DTForm.cpp

@@ -1,13 +0,0 @@
-#include"DTForm.h"
-#include<hgl/gui/Form.h>
-#include<hgl/graph/VKRenderTarget.h>
-
-namespace hgl
-{    
-    namespace gui
-    {
-        namespace default_theme
-        {
-        }//namespace default_theme
-    }//namespace gui
-}//namespace hgl

src/GUI/DefaultThemeEngine.cpp

@@ -6,24 +6,21 @@ namespace hgl
     {
         ThemeEngine *CreateDefaultThemeEngine(GPUDevice *dev)
         {
-            return(new default_theme::DefaultThemeEngine(dev));
+            return(new DefaultThemeEngine(dev));
         }
 
-        namespace default_theme
+        bool DefaultThemeEngine::Init()
         {
-            bool DefaultThemeEngine::Init()
+            return(true);
-            {
+        }
-                return(true);
-            }
 
-            void DefaultThemeEngine::Clear()
+        void DefaultThemeEngine::Clear()
-            {
+        {
-            }
+        }
 
-            ThemeForm *DefaultThemeEngine::CreateForm(Form *f,RenderTarget *rt,RenderCommand *rc)
+        ThemeForm *DefaultThemeEngine::CreateForm(Form *f,RenderTarget *rt,RenderCommand *rc)
-            {
+        {
-                return(new DTForm(f,rt,rc));
+            return(new DefaultThemeForm(f,rt,rc));
-            }
+        }
-        }//namespace default_theme
     }//namespace gui
 }//namespace hgl

src/GUI/DefaultThemeEngine.h

@@ -13,23 +13,20 @@ namespace hgl
 
         class Form;     ///<窗体
 
-        namespace default_theme
+        /**
+            * 缺省GUI主题引擎
+            */
+        class DefaultThemeEngine:public ThemeEngine
         {
-            /**
+        public:
-             * 缺省GUI主题引擎
-             */
-            class DefaultThemeEngine:public ThemeEngine
-            {
-            public:
 
-                using ThemeEngine::ThemeEngine;
+            using ThemeEngine::ThemeEngine;
-                virtual ~DefaultThemeEngine() override;
+            virtual ~DefaultThemeEngine() override;
 
-                bool Init() override;
+            bool Init() override;
-                void Clear() override;
+            void Clear() override;
                 
-                ThemeForm *CreateForm(Form *,RenderTarget *,RenderCommand *) override;
+            ThemeForm *CreateForm(Form *,RenderTarget *,RenderCommand *) override;
-            };//class DefaultThemeEngine:public ThemeEngine
+        };//class DefaultThemeEngine:public ThemeEngine
-        }//namespace default_theme
     }//namespace gui
-}//namespace hgl
+}//namespace hgl

src/GUI/DefaultThemeForm.cpp

@@ -0,0 +1,20 @@
+#include"DefaultThemeForm.h"
+#include<hgl/gui/Form.h>
+#include<hgl/graph/VKCommandBuffer.h>
+
+namespace hgl
+{    
+    namespace gui
+    {
+        bool DefaultThemeForm::Render()
+        {
+            if(!cmd_buf->BeginRenderPass())
+                return(false);
+
+                
+
+            cmd_buf->EndRenderPass();
+            return(true);
+        }
+    }//namespace gui
+}//namespace hgl

src/GUI/DefaultThemeForm.h

@@ -12,17 +12,16 @@ namespace hgl
 
         class Form;
 
-        namespace default_theme
+        class DefaultThemeForm:public ThemeForm
         {
-            class DTForm:public ThemeForm
-            {
 
-            public:
+        public:
 
-                using ThemeForm::ThemeForm;
+            using ThemeForm::ThemeForm;
-                ~DTForm()=default;
+            ~DefaultThemeForm()=default;
-            };//class DTForm
+
-        }//namespace default_theme
+            bool Render() override;
+        };//class DefaultThemeForm
     }//namespace gui
 }//namespace hgl
 #endif//HGL_GUI_DEFAULT_THEME_FORM_INCLUDE

src/GUI/ThemeEngine.cpp

@@ -121,6 +121,7 @@ namespace hgl
 
             tf->BeginRender();
 
+            tf->Render();
 
             tf->EndRender();
         }