This commit is contained in:
Zihan Chen
2016-12-13 04:25:27 -08:00
parent 71eba09e75
commit c09f06dc77
141 changed files with 4842 additions and 3645 deletions

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -48,7 +48,7 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
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)

View File

@@ -18,14 +18,14 @@ namespace demo
class MainWindow;
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:
protected:
vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
vl::presentation::controls::GuiSinglelineTextBox* textBoxC;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxC;
void InitializeComponents()
{
@@ -41,8 +41,8 @@ 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())
,textBoxA(0)
,textBoxB(0)
,textBoxC(0)

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -18,7 +18,7 @@
<Window Text="Binding_Eval" ClientSize="x:480 y:320">
<att.BoundsComposition-set PreferredMinSize="x:480 y:320"/>
<Label Text-eval="'1+2+3+4+5+6+7+8+9+10 = ' &amp; (1+2+3+4+5+6+7+8+9+10)">
<att.Font>fontFamily:{Segoe UI} size:32 antialias:true</att.Font>
<att.Font>fontFamily:"Segoe UI" size:32 antialias:true</att.Font>
</Label>
</Window>
</Instance>

View File

@@ -48,7 +48,7 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
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)

View File

@@ -18,7 +18,7 @@ namespace demo
class MainWindow;
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:
@@ -35,8 +35,8 @@ 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())
{
}
};

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -48,7 +48,7 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
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)

View File

@@ -18,12 +18,12 @@ namespace demo
class MainWindow;
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:
protected:
vl::presentation::controls::GuiSinglelineTextBox* textBoxName;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxName;
void InitializeComponents()
{
@@ -37,8 +37,8 @@ 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())
,textBoxName(0)
{
}

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -14,7 +14,7 @@ namespace demo
{
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void MainWindow::documentLabel_ActiveHyperlinkExecuted(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
void MainWindow::documentLabel_ActiveHyperlinkExecuted(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs& arguments)
{
}
@@ -52,10 +52,10 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
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)
CLASS_MEMBER_GUIEVENT_HANDLER(documentLabel_ActiveHyperlinkExecuted, vl::presentation::compositions::GuiEventArgs)
CLASS_MEMBER_GUIEVENT_HANDLER(documentLabel_ActiveHyperlinkExecuted, ::vl::presentation::compositions::GuiEventArgs)
END_CLASS_MEMBER(demo::MainWindow)
#undef _

View File

@@ -18,12 +18,12 @@ namespace demo
class MainWindow;
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:
protected:
vl::presentation::controls::GuiDocumentLabel* documentLabel;
::vl::presentation::controls::GuiDocumentLabel* documentLabel;
void InitializeComponents()
{
@@ -37,8 +37,8 @@ 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())
,documentLabel(0)
{
}
@@ -65,7 +65,7 @@ namespace demo
protected:
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void documentLabel_ActiveHyperlinkExecuted(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments);
void documentLabel_ActiveHyperlinkExecuted(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs& arguments);
void OnCreate();
void OnDestroy();
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -24,7 +24,7 @@ namespace demo
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
MainWindow::MainWindow(Ptr<demo::IViewModel> ViewModel)
MainWindow::MainWindow(vl::Ptr<demo::IViewModel> ViewModel)
{
InitializeComponents(ViewModel);
OnCreate();
@@ -49,13 +49,13 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
BEGIN_CLASS_MEMBER(demo::IViewModel)
CLASS_MEMBER_BASE(vl::reflection::IDescriptable)
CLASS_MEMBER_BASE(::vl::reflection::IDescriptable)
CLASS_MEMBER_METHOD(GetMessageFromName, { L"name" });
END_CLASS_MEMBER(demo::IViewModel)
BEGIN_CLASS_MEMBER(demo::MainWindow)
CLASS_MEMBER_BASE(vl::presentation::controls::GuiWindow)
CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(Ptr<demo::IViewModel>), { L"ViewModel" })
CLASS_MEMBER_BASE(::vl::presentation::controls::GuiWindow)
CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(vl::Ptr<demo::IViewModel>), { L"ViewModel" })
CLASS_MEMBER_PROPERTY_READONLY_FAST(ViewModel)
END_CLASS_MEMBER(demo::MainWindow)

View File

@@ -18,22 +18,22 @@ namespace demo
class IViewModel;
class MainWindow;
class IViewModel : public virtual vl::reflection::IDescriptable, public vl::reflection::Description<IViewModel>
class IViewModel : public virtual ::vl::reflection::IDescriptable, public vl::reflection::Description<IViewModel>
{
public:
virtual vl::WString GetMessageFromName(vl::WString name) = 0;
virtual ::vl::WString GetMessageFromName(::vl::WString name) = 0;
};
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:
Ptr<demo::IViewModel> ViewModel_;
vl::Ptr<demo::IViewModel> ViewModel_;
protected:
vl::presentation::controls::GuiSinglelineTextBox* textBoxName;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxName;
void InitializeComponents(Ptr<demo::IViewModel> ViewModel)
void InitializeComponents(vl::Ptr<demo::IViewModel> ViewModel)
{
ViewModel_ = ViewModel;
if (InitializeFromResource())
@@ -47,13 +47,13 @@ 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())
,textBoxName(0)
{
}
Ptr<demo::IViewModel> GetViewModel()
vl::Ptr<demo::IViewModel> GetViewModel()
{
return ViewModel_;
}
@@ -85,7 +85,7 @@ namespace demo
void OnDestroy();
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
public:
MainWindow(Ptr<demo::IViewModel> ViewModel);
MainWindow(vl::Ptr<demo::IViewModel> ViewModel);
~MainWindow();
};
}

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -20,10 +20,10 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
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)
CLASS_MEMBER_GUIEVENT_HANDLER(buttonCalculate_Clicked, vl::presentation::compositions::GuiEventArgs)
CLASS_MEMBER_GUIEVENT_HANDLER(buttonCalculate_Clicked, ::vl::presentation::compositions::GuiEventArgs)
END_CLASS_MEMBER(demo::MainWindow)
#undef _

View File

@@ -18,14 +18,14 @@ namespace demo
class MainWindow;
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:
protected:
vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
vl::presentation::controls::GuiSinglelineTextBox* textBoxC;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxC;
void InitializeComponents()
{
@@ -41,8 +41,8 @@ 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())
,textBoxA(0)
,textBoxB(0)
,textBoxC(0)

View File

@@ -12,14 +12,14 @@ namespace demo
{
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void MainWindow::buttonCalculate_Clicked(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
void MainWindow::buttonCalculate_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs& arguments)
{
bool successA = false;
bool successB = false;
auto a = wtoi_test(textBoxA->GetText(), successA);
auto b = wtoi_test(textBoxB->GetText(), successB);
auto a = vl::wtoi_test(textBoxA->GetText(), successA);
auto b = vl::wtoi_test(textBoxB->GetText(), successB);
auto c = (successA&&successB)
? itow(a + b)
? vl::itow(a + b)
: L"<ERROR>"
;
textBoxC->SetText(c);

View File

@@ -20,7 +20,7 @@ namespace demo
protected:
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void buttonCalculate_Clicked(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments);
void buttonCalculate_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs& arguments);
void OnCreate();
void OnDestroy();
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -48,7 +48,7 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
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)

View File

@@ -18,14 +18,14 @@ namespace demo
class MainWindow;
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:
protected:
vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
vl::presentation::controls::GuiSinglelineTextBox* textBoxC;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxC;
void InitializeComponents()
{
@@ -41,8 +41,8 @@ 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())
,textBoxA(0)
,textBoxB(0)
,textBoxC(0)

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -24,7 +24,7 @@ namespace demo
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
MainWindow::MainWindow(Ptr<demo::IViewModel> ViewModel)
MainWindow::MainWindow(vl::Ptr<demo::IViewModel> ViewModel)
{
InitializeComponents(ViewModel);
OnCreate();
@@ -49,14 +49,14 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
BEGIN_CLASS_MEMBER(demo::IViewModel)
CLASS_MEMBER_BASE(vl::reflection::IDescriptable)
CLASS_MEMBER_BASE(::vl::reflection::IDescriptable)
CLASS_MEMBER_METHOD(Add, { L"a" _ L"b" });
CLASS_MEMBER_METHOD(Error, NO_PARAMETER);
END_CLASS_MEMBER(demo::IViewModel)
BEGIN_CLASS_MEMBER(demo::MainWindow)
CLASS_MEMBER_BASE(vl::presentation::controls::GuiWindow)
CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(Ptr<demo::IViewModel>), { L"ViewModel" })
CLASS_MEMBER_BASE(::vl::presentation::controls::GuiWindow)
CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(vl::Ptr<demo::IViewModel>), { L"ViewModel" })
CLASS_MEMBER_PROPERTY_READONLY_FAST(ViewModel)
END_CLASS_MEMBER(demo::MainWindow)

View File

@@ -18,25 +18,25 @@ namespace demo
class IViewModel;
class MainWindow;
class IViewModel : public virtual vl::reflection::IDescriptable, public vl::reflection::Description<IViewModel>
class IViewModel : public virtual ::vl::reflection::IDescriptable, public vl::reflection::Description<IViewModel>
{
public:
virtual vl::vint32_t Add(vl::vint32_t a, vl::vint32_t b) = 0;
virtual vl::WString Error() = 0;
virtual ::vl::vint32_t Add(::vl::vint32_t a, ::vl::vint32_t b) = 0;
virtual ::vl::WString Error() = 0;
};
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:
Ptr<demo::IViewModel> ViewModel_;
vl::Ptr<demo::IViewModel> ViewModel_;
protected:
vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
vl::presentation::controls::GuiSinglelineTextBox* textBoxC;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxC;
void InitializeComponents(Ptr<demo::IViewModel> ViewModel)
void InitializeComponents(vl::Ptr<demo::IViewModel> ViewModel)
{
ViewModel_ = ViewModel;
if (InitializeFromResource())
@@ -52,15 +52,15 @@ 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())
,textBoxA(0)
,textBoxB(0)
,textBoxC(0)
{
}
Ptr<demo::IViewModel> GetViewModel()
vl::Ptr<demo::IViewModel> GetViewModel()
{
return ViewModel_;
}
@@ -92,7 +92,7 @@ namespace demo
void OnDestroy();
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
public:
MainWindow(Ptr<demo::IViewModel> ViewModel);
MainWindow(vl::Ptr<demo::IViewModel> ViewModel);
~MainWindow();
};
}

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -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>

View File

@@ -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)

View File

@@ -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)
{
}

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -29,7 +29,7 @@
<Window Text="Another Window" ClientSize="x:320 y:280">
<att.BoundsComposition-set PreferredMinSize="x:320 y:280"/>
<Label Text="This is another window!">
<att.Font>fontFamily:{Segoe UI} size:32 antialias:true</att.Font>
<att.Font>fontFamily:"Segoe UI" size:32 antialias:true</att.Font>
</Label>
</Window>
</Instance>

View File

@@ -49,15 +49,15 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
BEGIN_CLASS_MEMBER(demo::AnotherWindow)
CLASS_MEMBER_BASE(vl::presentation::controls::GuiWindow)
CLASS_MEMBER_BASE(::vl::presentation::controls::GuiWindow)
CLASS_MEMBER_CONSTRUCTOR(demo::AnotherWindow*(), NO_PARAMETER)
END_CLASS_MEMBER(demo::AnotherWindow)
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)
CLASS_MEMBER_GUIEVENT_HANDLER(buttonShowWindow_Clicked, vl::presentation::compositions::GuiEventArgs)
CLASS_MEMBER_GUIEVENT_HANDLER(buttonShowWindow_Clicked, ::vl::presentation::compositions::GuiEventArgs)
END_CLASS_MEMBER(demo::MainWindow)
#undef _

View File

@@ -19,7 +19,7 @@ namespace demo
class MainWindow;
template<typename TImpl>
class AnotherWindow_ : public vl::presentation::controls::GuiWindow, public vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiWindow>, public vl::reflection::Description<TImpl>
class AnotherWindow_ : 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,14 +36,14 @@ namespace demo
}
public:
AnotherWindow_()
:vl::presentation::GuiInstancePartialClass<vl::presentation::controls::GuiWindow>(L"demo::AnotherWindow")
,vl::presentation::controls::GuiWindow(vl::presentation::theme::GetCurrentTheme()->CreateWindowStyle())
:vl::presentation::GuiInstancePartialClass<::vl::presentation::controls::GuiWindow>(L"demo::AnotherWindow")
,::vl::presentation::controls::GuiWindow(vl::presentation::theme::GetCurrentTheme()->CreateWindowStyle())
{
}
};
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:
@@ -60,8 +60,8 @@ 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())
{
}
};

View File

@@ -12,7 +12,7 @@ namespace demo
{
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void MainWindow::buttonShowWindow_Clicked(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
void MainWindow::buttonShowWindow_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs& arguments)
{
auto window = new AnotherWindow;
window->MoveToScreenCenter();

View File

@@ -20,7 +20,7 @@ namespace demo
protected:
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void buttonShowWindow_Clicked(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments);
void buttonShowWindow_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs& arguments);
void OnCreate();
void OnDestroy();
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -18,7 +18,7 @@
<Window Text="Instance_Window" ClientSize="x:480 y:320">
<att.BoundsComposition-set PreferredMinSize="x:480 y:320"/>
<Label Text="This is a window!">
<att.Font>fontFamily:{Segoe UI} size:32 antialias:true</att.Font>
<att.Font>fontFamily:"Segoe UI" size:32 antialias:true</att.Font>
</Label>
</Window>
</Instance>

View File

@@ -48,7 +48,7 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
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)

View File

@@ -18,7 +18,7 @@ namespace demo
class MainWindow;
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:
@@ -35,8 +35,8 @@ 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())
{
}
};

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -20,10 +20,10 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
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)
CLASS_MEMBER_GUIEVENT_HANDLER(buttonPaste_Clicked, vl::presentation::compositions::GuiEventArgs)
CLASS_MEMBER_GUIEVENT_HANDLER(buttonPaste_Clicked, ::vl::presentation::compositions::GuiEventArgs)
CLASS_MEMBER_FIELD(integerState)
END_CLASS_MEMBER(demo::MainWindow)

View File

@@ -18,15 +18,15 @@ namespace demo
class MainWindow;
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:
protected:
vl::vint32_t integerState;
vl::presentation::controls::GuiWindow* self;
vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
::vl::vint32_t integerState;
::vl::presentation::controls::GuiWindow* self;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxA;
::vl::presentation::controls::GuiSinglelineTextBox* textBoxB;
void InitializeComponents()
{
@@ -42,13 +42,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())
,self(0)
,textBoxA(0)
,textBoxB(0)
{
this->integerState = vl::reflection::description::UnboxValue<vl::vint32_t>(vl::reflection::description::Value::From(L"0", reflection::description::GetTypeDescriptor<vl::vint32_t>()));
this->integerState = vl::reflection::description::UnboxValue<::vl::vint32_t>(
[]()
{
vl::reflection::description::Value value;
vl::reflection::description::GetTypeDescriptor<::vl::vint32_t>()->GetSerializableType()->Deserialize(L"0", value);
return value;
}());
}
};

View File

@@ -12,9 +12,9 @@ namespace demo
{
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void MainWindow::buttonPaste_Clicked(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments)
void MainWindow::buttonPaste_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs& arguments)
{
textBoxB->SetText(itow(this->integerState));
textBoxB->SetText(vl::itow(this->integerState));
}
void MainWindow::OnCreate()

View File

@@ -20,7 +20,7 @@ namespace demo
protected:
// #region CLASS_MEMBER_GUIEVENT_HANDLER (DO NOT PUT OTHER CONTENT IN THIS #region.)
void buttonPaste_Clicked(GuiGraphicsComposition* sender, vl::presentation::compositions::GuiEventArgs& arguments);
void buttonPaste_Clicked(::vl::presentation::compositions::GuiGraphicsComposition* sender, ::vl::presentation::compositions::GuiEventArgs& arguments);
void OnCreate();
void OnDestroy();
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER

View File

@@ -1,3 +1,4 @@
#define GAC_HEADER_USE_NAMESPACE
#include "UI/Source/Demo.h"
#include <Windows.h>

View File

@@ -32,7 +32,7 @@
<Window Text="Member_Parameter" ClientSize="x:480 y:320">
<att.BoundsComposition-set PreferredMinSize="x:480 y:320"/>
<Label Text-eval="ViewModel.GetText()">
<att.Font>fontFamily:{Segoe UI} size:32 antialias:true</att.Font>
<att.Font>fontFamily:"Segoe UI" size:32 antialias:true</att.Font>
</Label>
</Window>
</Instance>

View File

@@ -24,7 +24,7 @@ namespace demo
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
MainWindow::MainWindow(Ptr<demo::IViewModel> ViewModel)
MainWindow::MainWindow(vl::Ptr<demo::IViewModel> ViewModel)
{
InitializeComponents(ViewModel);
OnCreate();
@@ -49,13 +49,13 @@ namespace vl
IMPL_CPP_TYPE_INFO(demo::MainWindow)
BEGIN_CLASS_MEMBER(demo::IViewModel)
CLASS_MEMBER_BASE(vl::reflection::IDescriptable)
CLASS_MEMBER_BASE(::vl::reflection::IDescriptable)
CLASS_MEMBER_METHOD(GetText, NO_PARAMETER);
END_CLASS_MEMBER(demo::IViewModel)
BEGIN_CLASS_MEMBER(demo::MainWindow)
CLASS_MEMBER_BASE(vl::presentation::controls::GuiWindow)
CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(Ptr<demo::IViewModel>), { L"ViewModel" })
CLASS_MEMBER_BASE(::vl::presentation::controls::GuiWindow)
CLASS_MEMBER_CONSTRUCTOR(demo::MainWindow*(vl::Ptr<demo::IViewModel>), { L"ViewModel" })
CLASS_MEMBER_PROPERTY_READONLY_FAST(ViewModel)
END_CLASS_MEMBER(demo::MainWindow)

View File

@@ -18,21 +18,21 @@ namespace demo
class IViewModel;
class MainWindow;
class IViewModel : public virtual vl::reflection::IDescriptable, public vl::reflection::Description<IViewModel>
class IViewModel : public virtual ::vl::reflection::IDescriptable, public vl::reflection::Description<IViewModel>
{
public:
virtual vl::WString GetText() = 0;
virtual ::vl::WString GetText() = 0;
};
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:
Ptr<demo::IViewModel> ViewModel_;
vl::Ptr<demo::IViewModel> ViewModel_;
protected:
void InitializeComponents(Ptr<demo::IViewModel> ViewModel)
void InitializeComponents(vl::Ptr<demo::IViewModel> ViewModel)
{
ViewModel_ = ViewModel;
if (InitializeFromResource())
@@ -45,12 +45,12 @@ 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())
{
}
Ptr<demo::IViewModel> GetViewModel()
vl::Ptr<demo::IViewModel> GetViewModel()
{
return ViewModel_;
}
@@ -82,7 +82,7 @@ namespace demo
void OnDestroy();
// #endregion CLASS_MEMBER_GUIEVENT_HANDLER
public:
MainWindow(Ptr<demo::IViewModel> ViewModel);
MainWindow(vl::Ptr<demo::IViewModel> ViewModel);
~MainWindow();
};
}

Some files were not shown because too many files have changed in this diff Show More