From db20794b7fdf7cd37fd0beb49dd6611358aa386c Mon Sep 17 00:00:00 2001 From: hyzboy Date: Fri, 30 Oct 2020 19:02:50 +0800 Subject: [PATCH] Removed default_theme namespace --- inc/hgl/gui/ThemeForm.h | 11 +++++----- src/GUI/CMakeLists.txt | 4 ++-- src/GUI/DTForm.cpp | 13 ------------ src/GUI/DefaultThemeEngine.cpp | 25 ++++++++++------------ src/GUI/DefaultThemeEngine.h | 27 +++++++++++------------- src/GUI/DefaultThemeForm.cpp | 20 ++++++++++++++++++ src/GUI/{DTForm.h => DefaultThemeForm.h} | 15 ++++++------- src/GUI/ThemeEngine.cpp | 1 + 8 files changed, 59 insertions(+), 57 deletions(-) delete mode 100644 src/GUI/DTForm.cpp create mode 100644 src/GUI/DefaultThemeForm.cpp rename src/GUI/{DTForm.h => DefaultThemeForm.h} (57%) diff --git a/inc/hgl/gui/ThemeForm.h b/inc/hgl/gui/ThemeForm.h index 68ec7b2b..d9501007 100644 --- a/inc/hgl/gui/ThemeForm.h +++ b/inc/hgl/gui/ThemeForm.h @@ -24,13 +24,14 @@ namespace hgl ThemeForm(Form *,RenderTarget *,RenderCommand *); virtual ~ThemeForm(); - RenderTarget * GetRenderTarget(){return render_target;} - bool SetRenderTarget(RenderTarget *); + RenderTarget * GetRenderTarget(){return render_target;} + bool SetRenderTarget(RenderTarget *); - void Resize(uint w,uint h); + void Resize(uint w,uint h); - bool BeginRender(); - bool EndRender(); + bool BeginRender(); + virtual bool Render()=0; + bool EndRender(); };//class ThemeForm }//namespace gui }//namespace hgl diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt index 195219e2..d9eb11ea 100644 --- a/src/GUI/CMakeLists.txt +++ b/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 - DTForm.cpp) + DefaultThemeForm.h + DefaultThemeForm.cpp) set(WIDGET_SOURCE ${GUI_INCLUDE_PATH}/Widget.h ${GUI_INCLUDE_PATH}/Layout.h diff --git a/src/GUI/DTForm.cpp b/src/GUI/DTForm.cpp deleted file mode 100644 index 7e8d3699..00000000 --- a/src/GUI/DTForm.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include"DTForm.h" -#include -#include - -namespace hgl -{ - namespace gui - { - namespace default_theme - { - }//namespace default_theme - }//namespace gui -}//namespace hgl diff --git a/src/GUI/DefaultThemeEngine.cpp b/src/GUI/DefaultThemeEngine.cpp index aa652159..7e08b9b3 100644 --- a/src/GUI/DefaultThemeEngine.cpp +++ b/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) - { - return(new DTForm(f,rt,rc)); - } - }//namespace default_theme + ThemeForm *DefaultThemeEngine::CreateForm(Form *f,RenderTarget *rt,RenderCommand *rc) + { + return(new DefaultThemeForm(f,rt,rc)); + } }//namespace gui }//namespace hgl \ No newline at end of file diff --git a/src/GUI/DefaultThemeEngine.h b/src/GUI/DefaultThemeEngine.h index d2042f83..807998ea 100644 --- a/src/GUI/DefaultThemeEngine.h +++ b/src/GUI/DefaultThemeEngine.h @@ -13,23 +13,20 @@ namespace hgl class Form; ///<窗体 - namespace default_theme + /** + * 缺省GUI主题引擎 + */ + class DefaultThemeEngine:public ThemeEngine { - /** - * 缺省GUI主题引擎 - */ - class DefaultThemeEngine:public ThemeEngine - { - public: + public: - using ThemeEngine::ThemeEngine; - virtual ~DefaultThemeEngine() override; + using ThemeEngine::ThemeEngine; + virtual ~DefaultThemeEngine() override; - bool Init() override; - void Clear() override; + bool Init() override; + void Clear() override; - ThemeForm *CreateForm(Form *,RenderTarget *,RenderCommand *) override; - };//class DefaultThemeEngine:public ThemeEngine - }//namespace default_theme + ThemeForm *CreateForm(Form *,RenderTarget *,RenderCommand *) override; + };//class DefaultThemeEngine:public ThemeEngine }//namespace gui -}//namespace hgl \ No newline at end of file +}//namespace hgl diff --git a/src/GUI/DefaultThemeForm.cpp b/src/GUI/DefaultThemeForm.cpp new file mode 100644 index 00000000..997df388 --- /dev/null +++ b/src/GUI/DefaultThemeForm.cpp @@ -0,0 +1,20 @@ +#include"DefaultThemeForm.h" +#include +#include + +namespace hgl +{ + namespace gui + { + bool DefaultThemeForm::Render() + { + if(!cmd_buf->BeginRenderPass()) + return(false); + + + + cmd_buf->EndRenderPass(); + return(true); + } + }//namespace gui +}//namespace hgl diff --git a/src/GUI/DTForm.h b/src/GUI/DefaultThemeForm.h similarity index 57% rename from src/GUI/DTForm.h rename to src/GUI/DefaultThemeForm.h index 65805d8c..a5d7e6b6 100644 --- a/src/GUI/DTForm.h +++ b/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; - ~DTForm()=default; - };//class DTForm - }//namespace default_theme + using ThemeForm::ThemeForm; + ~DefaultThemeForm()=default; + + bool Render() override; + };//class DefaultThemeForm }//namespace gui }//namespace hgl #endif//HGL_GUI_DEFAULT_THEME_FORM_INCLUDE diff --git a/src/GUI/ThemeEngine.cpp b/src/GUI/ThemeEngine.cpp index 9130dae9..55ca3546 100644 --- a/src/GUI/ThemeEngine.cpp +++ b/src/GUI/ThemeEngine.cpp @@ -121,6 +121,7 @@ namespace hgl tf->BeginRender(); + tf->Render(); tf->EndRender(); }