mirror of
https://github.com/vczh-libraries/Release.git
synced 2026-08-18 01:44:28 +08:00
...
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
#define GAC_HEADER_USE_NAMESPACE
|
||||
#include "UI/Source/Demo.h"
|
||||
#include <Windows.h>
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<Window Text="Instance_Control" ClientSize="x:480 y:320">
|
||||
<att.BoundsComposition-set PreferredMinSize="x:480 y:320"/>
|
||||
<x:MyControl Text="This is a control!">
|
||||
<att.Font>fontFamily:{Segoe UI} size:32 antialias:true</att.Font>
|
||||
<att.Font>fontFamily:"Segoe UI" size:32 antialias:true</att.Font>
|
||||
</x:MyControl>
|
||||
</Window>
|
||||
</Instance>
|
||||
|
||||
@@ -77,12 +77,12 @@ namespace vl
|
||||
IMPL_CPP_TYPE_INFO(demo::MyControl)
|
||||
|
||||
BEGIN_CLASS_MEMBER(demo::MainWindow)
|
||||
CLASS_MEMBER_BASE(vl::presentation::controls::GuiWindow)
|
||||
CLASS_MEMBER_BASE(::vl::presentation::controls::GuiWindow)
|
||||
CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(), NO_PARAMETER)
|
||||
END_CLASS_MEMBER(demo::MainWindow)
|
||||
|
||||
BEGIN_CLASS_MEMBER(demo::MyControl)
|
||||
CLASS_MEMBER_BASE(vl::presentation::controls::GuiCustomControl)
|
||||
CLASS_MEMBER_BASE(::vl::presentation::controls::GuiCustomControl)
|
||||
CLASS_MEMBER_CONSTRUCTOR(demo::MyControl*(), NO_PARAMETER)
|
||||
END_CLASS_MEMBER(demo::MyControl)
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace demo
|
||||
class MyControl;
|
||||
|
||||
template<typename TImpl>
|
||||
class MainWindow_ : public vl::presentation::controls::GuiWindow, public vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiWindow>, public vl::reflection::Description<TImpl>
|
||||
class MainWindow_ : public ::vl::presentation::controls::GuiWindow, public vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiWindow>, public vl::reflection::Description<TImpl>
|
||||
{
|
||||
friend struct vl::reflection::description::CustomTypeDescriptorSelector<TImpl>;
|
||||
private:
|
||||
@@ -36,19 +36,19 @@ namespace demo
|
||||
}
|
||||
public:
|
||||
MainWindow_()
|
||||
:vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiWindow>(L"demo::MainWindow")
|
||||
,vl::presentation::controls::GuiWindow(vl::presentation::theme::GetCurrentTheme()->CreateWindowStyle())
|
||||
:vl::presentation::GuiInstancePartialClass<::vl::presentation::controls::GuiWindow>(L"demo::MainWindow")
|
||||
,::vl::presentation::controls::GuiWindow(vl::presentation::theme::GetCurrentTheme()->CreateWindowStyle())
|
||||
{
|
||||
}
|
||||
};
|
||||
|
||||
template<typename TImpl>
|
||||
class MyControl_ : public vl::presentation::controls::GuiCustomControl, public vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiCustomControl>, public vl::reflection::Description<TImpl>
|
||||
class MyControl_ : public ::vl::presentation::controls::GuiCustomControl, public vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiCustomControl>, public vl::reflection::Description<TImpl>
|
||||
{
|
||||
friend struct vl::reflection::description::CustomTypeDescriptorSelector<TImpl>;
|
||||
private:
|
||||
protected:
|
||||
vl::presentation::controls::GuiCustomControl* self;
|
||||
::vl::presentation::controls::GuiCustomControl* self;
|
||||
|
||||
void InitializeComponents()
|
||||
{
|
||||
@@ -62,8 +62,8 @@ namespace demo
|
||||
}
|
||||
public:
|
||||
MyControl_()
|
||||
:vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiCustomControl>(L"demo::MyControl")
|
||||
,vl::presentation::controls::GuiCustomControl(vl::presentation::theme::GetCurrentTheme()->CreateCustomControlStyle())
|
||||
:vl::presentation::GuiInstancePartialClass<::vl::presentation::controls::GuiCustomControl>(L"demo::MyControl")
|
||||
,::vl::presentation::controls::GuiCustomControl(vl::presentation::theme::GetCurrentTheme()->CreateCustomControlStyle())
|
||||
,self(0)
|
||||
{
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user