mirror of
https://github.com/vczh-libraries/Release.git
synced 2026-05-27 18:25:27 +08:00
Update import
This commit is contained in:
@@ -1940,6 +1940,16 @@ WindowsController
|
|||||||
|
|
||||||
//=======================================================================
|
//=======================================================================
|
||||||
|
|
||||||
|
const NativeWindowFrameConfig& GetMainWindowFrameConfig()
|
||||||
|
{
|
||||||
|
return NativeWindowFrameConfig::Default;
|
||||||
|
}
|
||||||
|
|
||||||
|
const NativeWindowFrameConfig& GetNonMainWindowFrameConfig()
|
||||||
|
{
|
||||||
|
return NativeWindowFrameConfig::Default;
|
||||||
|
}
|
||||||
|
|
||||||
INativeWindow* CreateNativeWindow(INativeWindow::WindowMode windowMode)override
|
INativeWindow* CreateNativeWindow(INativeWindow::WindowMode windowMode)override
|
||||||
{
|
{
|
||||||
WindowsForm* window = new WindowsForm(godWindow, windowClass.GetName(), hInstance, windowMode);
|
WindowsForm* window = new WindowsForm(godWindow, windowClass.GetName(), hInstance, windowMode);
|
||||||
|
|||||||
+218
-129
@@ -2427,45 +2427,20 @@ GuiWindow
|
|||||||
|
|
||||||
void GuiWindow::AfterControlTemplateInstalled_(bool initialize)
|
void GuiWindow::AfterControlTemplateInstalled_(bool initialize)
|
||||||
{
|
{
|
||||||
|
ApplyFrameConfig();
|
||||||
|
|
||||||
auto ct = TypedControlTemplateObject(true);
|
auto ct = TypedControlTemplateObject(true);
|
||||||
#define FIX_WINDOW_PROPERTY(VARIABLE, NAME) \
|
|
||||||
switch (ct->Get ## NAME ## Option()) \
|
|
||||||
{ \
|
|
||||||
case templates::BoolOption::AlwaysTrue: \
|
|
||||||
VARIABLE = true; \
|
|
||||||
break; \
|
|
||||||
case templates::BoolOption::AlwaysFalse: \
|
|
||||||
VARIABLE = false; \
|
|
||||||
break; \
|
|
||||||
default:; \
|
|
||||||
} \
|
|
||||||
|
|
||||||
FIX_WINDOW_PROPERTY(hasMaximizedBox, MaximizedBox)
|
|
||||||
FIX_WINDOW_PROPERTY(hasMinimizedBox, MinimizedBox)
|
|
||||||
FIX_WINDOW_PROPERTY(hasBorder, Border)
|
|
||||||
FIX_WINDOW_PROPERTY(hasSizeBox, SizeBox)
|
|
||||||
FIX_WINDOW_PROPERTY(isIconVisible, IconVisible)
|
|
||||||
FIX_WINDOW_PROPERTY(hasTitleBar, TitleBar)
|
|
||||||
|
|
||||||
#undef FIX_WINDOW_PROPERTY
|
|
||||||
ct->SetMaximizedBox(hasMaximizedBox);
|
|
||||||
ct->SetMinimizedBox(hasMinimizedBox);
|
|
||||||
ct->SetBorder(hasBorder);
|
|
||||||
ct->SetSizeBox(hasSizeBox);
|
|
||||||
ct->SetIconVisible(isIconVisible);
|
|
||||||
ct->SetTitleBar(hasTitleBar);
|
|
||||||
ct->SetMaximized(GetNativeWindow()->GetSizeState() != INativeWindow::Maximized);
|
|
||||||
ct->SetActivated(GetRenderingAsActivated());
|
|
||||||
|
|
||||||
auto window = GetNativeWindow();
|
auto window = GetNativeWindow();
|
||||||
|
|
||||||
|
SetControlTemplateProperties();
|
||||||
|
UpdateIcon(window, ct);
|
||||||
|
UpdateCustomFramePadding(window, ct);
|
||||||
|
|
||||||
if (window)
|
if (window)
|
||||||
{
|
{
|
||||||
window->SetIcon(icon);
|
window->SetIcon(icon);
|
||||||
}
|
}
|
||||||
|
SetNativeWindowFrameProperties();
|
||||||
UpdateIcon(window, ct);
|
|
||||||
UpdateCustomFramePadding(window, ct);
|
|
||||||
SyncNativeWindowProperties();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GuiWindow::UpdateIcon(INativeWindow* window, templates::GuiWindowTemplate* ct)
|
void GuiWindow::UpdateIcon(INativeWindow* window, templates::GuiWindowTemplate* ct)
|
||||||
@@ -2485,7 +2460,22 @@ GuiWindow
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void GuiWindow::SyncNativeWindowProperties()
|
void GuiWindow::SetControlTemplateProperties()
|
||||||
|
{
|
||||||
|
if (auto ct = TypedControlTemplateObject(false))
|
||||||
|
{
|
||||||
|
ct->SetMaximizedBox(hasMaximizedBox);
|
||||||
|
ct->SetMinimizedBox(hasMinimizedBox);
|
||||||
|
ct->SetBorder(hasBorder);
|
||||||
|
ct->SetSizeBox(hasSizeBox);
|
||||||
|
ct->SetIconVisible(isIconVisible);
|
||||||
|
ct->SetTitleBar(hasTitleBar);
|
||||||
|
ct->SetMaximized(GetNativeWindow()->GetSizeState() != INativeWindow::Maximized);
|
||||||
|
ct->SetActivated(GetRenderingAsActivated());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void GuiWindow::SetNativeWindowFrameProperties()
|
||||||
{
|
{
|
||||||
if (auto window = GetNativeWindow())
|
if (auto window = GetNativeWindow())
|
||||||
{
|
{
|
||||||
@@ -2508,6 +2498,66 @@ GuiWindow
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool GuiWindow::ApplyFrameConfigOnVariable(BoolOption frameConfig, BoolOption templateConfig, bool& variable)
|
||||||
|
{
|
||||||
|
if (frameConfig == BoolOption::AlwaysTrue && templateConfig == BoolOption::AlwaysFalse)return false;
|
||||||
|
if (frameConfig == BoolOption::AlwaysFalse && templateConfig == BoolOption::AlwaysTrue) return false;
|
||||||
|
|
||||||
|
if (frameConfig == BoolOption::AlwaysTrue || templateConfig == BoolOption::AlwaysTrue)
|
||||||
|
{
|
||||||
|
variable = true;
|
||||||
|
}
|
||||||
|
else if (frameConfig == BoolOption::AlwaysFalse || templateConfig == BoolOption::AlwaysFalse)
|
||||||
|
{
|
||||||
|
variable = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void GuiWindow::ApplyFrameConfig()
|
||||||
|
{
|
||||||
|
#define ERROR_MESSAGE_PREFIX L"vl::presentation::controls::GuiWindow::CheckCustomFrameAndControlTemplateCompatibility#"
|
||||||
|
|
||||||
|
#define FIX_WINDOW_PROPERTY(VARIABLE, NAME)\
|
||||||
|
CHECK_ERROR(\
|
||||||
|
ApplyFrameConfigOnVariable(\
|
||||||
|
(frameConfig ? frameConfig->NAME ## Option : BoolOption::Customizable),\
|
||||||
|
(ct ? ct->Get ## NAME ## Option() : BoolOption::Customizable),\
|
||||||
|
VARIABLE\
|
||||||
|
),\
|
||||||
|
ERROR_MESSAGE_PREFIX L"Frame configuration and control template are not compatible on property \"" L ## #NAME L"\"."\
|
||||||
|
);\
|
||||||
|
|
||||||
|
auto ct = TypedControlTemplateObject(false);
|
||||||
|
if (frameConfig && ct)
|
||||||
|
{
|
||||||
|
if (
|
||||||
|
(frameConfig->CustomFrameEnabled == BoolOption::AlwaysTrue && !ct->GetCustomFrameEnabled()) ||
|
||||||
|
(frameConfig->CustomFrameEnabled == BoolOption::AlwaysFalse && ct->GetCustomFrameEnabled())
|
||||||
|
)
|
||||||
|
{
|
||||||
|
CHECK_FAIL(ERROR_MESSAGE_PREFIX L"Frame configuration and control template are not compatible on property \"CustomFrameEnabled\".");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FIX_WINDOW_PROPERTY(hasMaximizedBox, MaximizedBox)
|
||||||
|
FIX_WINDOW_PROPERTY(hasMinimizedBox, MinimizedBox)
|
||||||
|
FIX_WINDOW_PROPERTY(hasBorder, Border)
|
||||||
|
FIX_WINDOW_PROPERTY(hasSizeBox, SizeBox)
|
||||||
|
FIX_WINDOW_PROPERTY(isIconVisible, IconVisible)
|
||||||
|
FIX_WINDOW_PROPERTY(hasTitleBar, TitleBar)
|
||||||
|
|
||||||
|
auto window = GetNativeWindow();
|
||||||
|
SetControlTemplateProperties();
|
||||||
|
UpdateCustomFramePadding(window, ct);
|
||||||
|
SetNativeWindowFrameProperties();
|
||||||
|
|
||||||
|
#undef FIX_WINDOW_PROPERTY
|
||||||
|
|
||||||
|
#undef ERROR_MESSAGE_PREFIX
|
||||||
|
}
|
||||||
|
|
||||||
void GuiWindow::Moved()
|
void GuiWindow::Moved()
|
||||||
{
|
{
|
||||||
GuiControlHost::Moved();
|
GuiControlHost::Moved();
|
||||||
@@ -2534,27 +2584,16 @@ GuiWindow
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void GuiWindow::BecomeNonMainHostedWindow()
|
void GuiWindow::AssignFrameConfig(const NativeWindowFrameConfig& config)
|
||||||
{
|
{
|
||||||
#define ERROR_MESSAGE_PREFIX L"vl::presentation::controls::GuiWindow::BecomeNonMainHostedWindow()#"
|
frameConfig = &config;
|
||||||
auto ct = TypedControlTemplateObject(true);
|
FrameConfigChanged.Execute(GetNotifyEventArguments());
|
||||||
CHECK_ERROR(ct->GetMaximizedBoxOption() != templates::BoolOption::AlwaysTrue, ERROR_MESSAGE_PREFIX L"MaximizedBox for non-main hosted windows must be able to config to false.");
|
ApplyFrameConfig();
|
||||||
CHECK_ERROR(ct->GetMinimizedBoxOption() != templates::BoolOption::AlwaysTrue, ERROR_MESSAGE_PREFIX L"MinimizedBox for non-main hosted windows must be able to config to false.");
|
|
||||||
if (hasMaximizedBox || hasMinimizedBox)
|
|
||||||
{
|
|
||||||
hasMaximizedBox = false;
|
|
||||||
hasMinimizedBox = false;
|
|
||||||
|
|
||||||
ct->SetMaximizedBox(false);
|
|
||||||
ct->SetMinimizedBox(false);
|
|
||||||
UpdateCustomFramePadding(GetNativeWindow(), ct);
|
|
||||||
}
|
|
||||||
#undef ERROR_MESSAGE_PREFIX
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void GuiWindow::OnNativeWindowChanged()
|
void GuiWindow::OnNativeWindowChanged()
|
||||||
{
|
{
|
||||||
SyncNativeWindowProperties();
|
SetNativeWindowFrameProperties();
|
||||||
GuiControlHost::OnNativeWindowChanged();
|
GuiControlHost::OnNativeWindowChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2589,6 +2628,7 @@ GuiWindow
|
|||||||
SetNativeWindow(window);
|
SetNativeWindow(window);
|
||||||
GetApplication()->RegisterWindow(this);
|
GetApplication()->RegisterWindow(this);
|
||||||
ClipboardUpdated.SetAssociatedComposition(boundsComposition);
|
ClipboardUpdated.SetAssociatedComposition(boundsComposition);
|
||||||
|
FrameConfigChanged.SetAssociatedComposition(boundsComposition);
|
||||||
|
|
||||||
WindowActivated.AttachMethod(this, &GuiWindow::OnWindowActivated);
|
WindowActivated.AttachMethod(this, &GuiWindow::OnWindowActivated);
|
||||||
WindowDeactivated.AttachMethod(this, &GuiWindow::OnWindowDeactivated);
|
WindowDeactivated.AttachMethod(this, &GuiWindow::OnWindowDeactivated);
|
||||||
@@ -2646,6 +2686,11 @@ GuiWindow
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const NativeWindowFrameConfig& GuiWindow::GetFrameConfig()
|
||||||
|
{
|
||||||
|
return frameConfig ? *frameConfig : NativeWindowFrameConfig::Default;
|
||||||
|
}
|
||||||
|
|
||||||
#define IMPL_WINDOW_PROPERTY(VARIABLE, NAME, CONDITION_BREAK) \
|
#define IMPL_WINDOW_PROPERTY(VARIABLE, NAME, CONDITION_BREAK) \
|
||||||
bool GuiWindow::Get ## NAME() \
|
bool GuiWindow::Get ## NAME() \
|
||||||
{ \
|
{ \
|
||||||
@@ -2654,7 +2699,7 @@ GuiWindow
|
|||||||
void GuiWindow::Set ## NAME(bool visible) \
|
void GuiWindow::Set ## NAME(bool visible) \
|
||||||
{ \
|
{ \
|
||||||
auto ct = TypedControlTemplateObject(true); \
|
auto ct = TypedControlTemplateObject(true); \
|
||||||
if (ct->Get ## NAME ## Option() == templates::BoolOption::Customizable) \
|
if (ct->Get ## NAME ## Option() == BoolOption::Customizable) \
|
||||||
{ \
|
{ \
|
||||||
VARIABLE = visible; \
|
VARIABLE = visible; \
|
||||||
ct->Set ## NAME(visible); \
|
ct->Set ## NAME(visible); \
|
||||||
@@ -17648,6 +17693,33 @@ namespace vl
|
|||||||
|
|
||||||
TemplateProperty<GuiControlTemplate> CreateStyle(ThemeName themeName)override
|
TemplateProperty<GuiControlTemplate> CreateStyle(ThemeName themeName)override
|
||||||
{
|
{
|
||||||
|
#define ERROR_MESSAGE_PREFIX L"vl::presentation::theme::ITheme::CreateStyle(ThemeName)#"
|
||||||
|
if (themeName == ThemeName::Window)
|
||||||
|
{
|
||||||
|
bool preferCustomFrameWindow = true;
|
||||||
|
auto current = last;
|
||||||
|
while (current)
|
||||||
|
{
|
||||||
|
if (current->PreferCustomFrameWindow)
|
||||||
|
{
|
||||||
|
preferCustomFrameWindow = current->PreferCustomFrameWindow.Value();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
current = current->previous;
|
||||||
|
}
|
||||||
|
|
||||||
|
CHECK_ERROR(current, ERROR_MESSAGE_PREFIX L"At least one ThemeTemplates::PreferCustomFrameWindow should be defined.");
|
||||||
|
|
||||||
|
if (preferCustomFrameWindow)
|
||||||
|
{
|
||||||
|
themeName = ThemeName::CustomFrameWindow;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
themeName = ThemeName::SystemFrameWindow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (themeName)
|
switch (themeName)
|
||||||
{
|
{
|
||||||
#define GUI_DEFINE_ITEM_PROPERTY(TEMPLATE, CONTROL) \
|
#define GUI_DEFINE_ITEM_PROPERTY(TEMPLATE, CONTROL) \
|
||||||
@@ -17668,8 +17740,9 @@ namespace vl
|
|||||||
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_ITEM_PROPERTY)
|
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_ITEM_PROPERTY)
|
||||||
#undef GUI_DEFINE_ITEM_PROPERTY
|
#undef GUI_DEFINE_ITEM_PROPERTY
|
||||||
default:
|
default:
|
||||||
CHECK_FAIL(L"vl::presentation::theme::ITheme::CreateStyle(ThemeName)#Unknown theme name.");
|
CHECK_FAIL(ERROR_MESSAGE_PREFIX L"Unknown theme name.");
|
||||||
}
|
}
|
||||||
|
#undef ERROR_MESSAGE_PREFIX
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -33552,6 +33625,7 @@ namespace vl
|
|||||||
{
|
{
|
||||||
namespace presentation
|
namespace presentation
|
||||||
{
|
{
|
||||||
|
const NativeWindowFrameConfig NativeWindowFrameConfig::Default = {};
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
INativeWindowListener
|
INativeWindowListener
|
||||||
@@ -33703,11 +33777,7 @@ INativeWindowListener
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void INativeWindowListener::BecomeMainHostedWindow()
|
void INativeWindowListener::AssignFrameConfig(const NativeWindowFrameConfig& config)
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void INativeWindowListener::BecomeNonMainHostedWindow()
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34914,61 +34984,6 @@ GuiHostedController::INativeControllerListener
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/***********************************************************************
|
|
||||||
GuiHostedController::INativeController
|
|
||||||
***********************************************************************/
|
|
||||||
|
|
||||||
INativeCallbackService* GuiHostedController::CallbackService()
|
|
||||||
{
|
|
||||||
return &callbackService;
|
|
||||||
}
|
|
||||||
|
|
||||||
INativeResourceService* GuiHostedController::ResourceService()
|
|
||||||
{
|
|
||||||
return nativeController->ResourceService();
|
|
||||||
}
|
|
||||||
|
|
||||||
INativeAsyncService* GuiHostedController::AsyncService()
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
INativeClipboardService* GuiHostedController::ClipboardService()
|
|
||||||
{
|
|
||||||
return nativeController->ClipboardService();
|
|
||||||
}
|
|
||||||
|
|
||||||
INativeImageService* GuiHostedController::ImageService()
|
|
||||||
{
|
|
||||||
return nativeController->ImageService();
|
|
||||||
}
|
|
||||||
|
|
||||||
INativeInputService* GuiHostedController::InputService()
|
|
||||||
{
|
|
||||||
return nativeController->InputService();
|
|
||||||
}
|
|
||||||
|
|
||||||
INativeDialogService* GuiHostedController::DialogService()
|
|
||||||
{
|
|
||||||
// Use FakeDialogServiceBase
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
WString GuiHostedController::GetExecutablePath()
|
|
||||||
{
|
|
||||||
return nativeController->GetExecutablePath();
|
|
||||||
}
|
|
||||||
|
|
||||||
INativeScreenService* GuiHostedController::ScreenService()
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
INativeWindowService* GuiHostedController::WindowService()
|
|
||||||
{
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
GuiHostedController::INativeAsyncService
|
GuiHostedController::INativeAsyncService
|
||||||
***********************************************************************/
|
***********************************************************************/
|
||||||
@@ -35068,6 +35083,21 @@ GuiHostedController::INativeScreen
|
|||||||
GuiHostedController::INativeWindowService
|
GuiHostedController::INativeWindowService
|
||||||
***********************************************************************/
|
***********************************************************************/
|
||||||
|
|
||||||
|
const NativeWindowFrameConfig& GuiHostedController::GetMainWindowFrameConfig()
|
||||||
|
{
|
||||||
|
return nativeController->WindowService()->GetMainWindowFrameConfig();
|
||||||
|
}
|
||||||
|
|
||||||
|
const NativeWindowFrameConfig& GuiHostedController::GetNonMainWindowFrameConfig()
|
||||||
|
{
|
||||||
|
static const NativeWindowFrameConfig config = {
|
||||||
|
.MaximizedBoxOption = BoolOption::AlwaysFalse,
|
||||||
|
.MinimizedBoxOption = BoolOption::AlwaysFalse,
|
||||||
|
.CustomFrameEnabled = BoolOption::AlwaysTrue,
|
||||||
|
};
|
||||||
|
return config;
|
||||||
|
}
|
||||||
|
|
||||||
INativeWindow* GuiHostedController::CreateNativeWindow(INativeWindow::WindowMode windowMode)
|
INativeWindow* GuiHostedController::CreateNativeWindow(INativeWindow::WindowMode windowMode)
|
||||||
{
|
{
|
||||||
auto hostedWindow = Ptr(new GuiHostedWindow(this, windowMode));
|
auto hostedWindow = Ptr(new GuiHostedWindow(this, windowMode));
|
||||||
@@ -35246,6 +35276,61 @@ GuiHostedController
|
|||||||
|
|
||||||
#undef ERROR_MESSAGE_PREFIX
|
#undef ERROR_MESSAGE_PREFIX
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/***********************************************************************
|
||||||
|
GuiHostedController::INativeController
|
||||||
|
***********************************************************************/
|
||||||
|
|
||||||
|
INativeCallbackService* GuiHostedController::CallbackService()
|
||||||
|
{
|
||||||
|
return &callbackService;
|
||||||
|
}
|
||||||
|
|
||||||
|
INativeResourceService* GuiHostedController::ResourceService()
|
||||||
|
{
|
||||||
|
return nativeController->ResourceService();
|
||||||
|
}
|
||||||
|
|
||||||
|
INativeAsyncService* GuiHostedController::AsyncService()
|
||||||
|
{
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
INativeClipboardService* GuiHostedController::ClipboardService()
|
||||||
|
{
|
||||||
|
return nativeController->ClipboardService();
|
||||||
|
}
|
||||||
|
|
||||||
|
INativeImageService* GuiHostedController::ImageService()
|
||||||
|
{
|
||||||
|
return nativeController->ImageService();
|
||||||
|
}
|
||||||
|
|
||||||
|
INativeInputService* GuiHostedController::InputService()
|
||||||
|
{
|
||||||
|
return nativeController->InputService();
|
||||||
|
}
|
||||||
|
|
||||||
|
INativeDialogService* GuiHostedController::DialogService()
|
||||||
|
{
|
||||||
|
// Use FakeDialogServiceBase
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
WString GuiHostedController::GetExecutablePath()
|
||||||
|
{
|
||||||
|
return nativeController->GetExecutablePath();
|
||||||
|
}
|
||||||
|
|
||||||
|
INativeScreenService* GuiHostedController::ScreenService()
|
||||||
|
{
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
INativeWindowService* GuiHostedController::WindowService()
|
||||||
|
{
|
||||||
|
return this;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35843,6 +35928,11 @@ GuiMainHostedWindowProxy
|
|||||||
|
|
||||||
void CheckAndSyncProperties() override
|
void CheckAndSyncProperties() override
|
||||||
{
|
{
|
||||||
|
for (auto listener : data->listeners)
|
||||||
|
{
|
||||||
|
listener->AssignFrameConfig(data->controller->WindowService()->GetMainWindowFrameConfig());
|
||||||
|
}
|
||||||
|
|
||||||
if (!data->wmWindow.visible)
|
if (!data->wmWindow.visible)
|
||||||
{
|
{
|
||||||
data->wmWindow.Show();
|
data->wmWindow.Show();
|
||||||
@@ -36050,6 +36140,7 @@ GuiNonMainHostedWindowProxy
|
|||||||
{
|
{
|
||||||
protected:
|
protected:
|
||||||
GuiHostedWindowData* data = nullptr;
|
GuiHostedWindowData* data = nullptr;
|
||||||
|
bool calledAssignFrameConfig = false;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@@ -36070,17 +36161,21 @@ GuiNonMainHostedWindowProxy
|
|||||||
L"Border, SizeBox, TitleBar.");
|
L"Border, SizeBox, TitleBar.");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CallAssignFrameConfigIfNever()
|
||||||
|
{
|
||||||
|
if (calledAssignFrameConfig) return;
|
||||||
|
for (auto listener : data->listeners)
|
||||||
|
{
|
||||||
|
listener->AssignFrameConfig(data->controller->WindowService()->GetNonMainWindowFrameConfig());
|
||||||
|
calledAssignFrameConfig = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void CheckAndSyncProperties() override
|
void CheckAndSyncProperties() override
|
||||||
{
|
{
|
||||||
if (data->windowMaximizedBox || data->windowMinimizedBox)
|
data->windowMaximizedBox = false;
|
||||||
{
|
data->windowMinimizedBox = false;
|
||||||
data->windowMaximizedBox = false;
|
CallAssignFrameConfigIfNever();
|
||||||
data->windowMinimizedBox = false;
|
|
||||||
for (auto listener : data->listeners)
|
|
||||||
{
|
|
||||||
listener->BecomeNonMainHostedWindow();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
EnsureNoSystemBorderWhenVisible();
|
EnsureNoSystemBorderWhenVisible();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36126,10 +36221,6 @@ GuiNonMainHostedWindowProxy
|
|||||||
if (data->windowMaximizedBox)
|
if (data->windowMaximizedBox)
|
||||||
{
|
{
|
||||||
data->windowMaximizedBox = false;
|
data->windowMaximizedBox = false;
|
||||||
for (auto listener : data->listeners)
|
|
||||||
{
|
|
||||||
listener->BecomeNonMainHostedWindow();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36138,10 +36229,6 @@ GuiNonMainHostedWindowProxy
|
|||||||
if (data->windowMinimizedBox)
|
if (data->windowMinimizedBox)
|
||||||
{
|
{
|
||||||
data->windowMinimizedBox = false;
|
data->windowMinimizedBox = false;
|
||||||
for (auto listener : data->listeners)
|
|
||||||
{
|
|
||||||
listener->BecomeNonMainHostedWindow();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36189,6 +36276,7 @@ GuiNonMainHostedWindowProxy
|
|||||||
|
|
||||||
void Show() override
|
void Show() override
|
||||||
{
|
{
|
||||||
|
CallAssignFrameConfigIfNever();
|
||||||
data->wmWindow.SetVisible(true);
|
data->wmWindow.SetVisible(true);
|
||||||
data->wmWindow.Activate();
|
data->wmWindow.Activate();
|
||||||
EnsureNoSystemBorderWhenVisible();
|
EnsureNoSystemBorderWhenVisible();
|
||||||
@@ -36196,6 +36284,7 @@ GuiNonMainHostedWindowProxy
|
|||||||
|
|
||||||
void ShowDeactivated() override
|
void ShowDeactivated() override
|
||||||
{
|
{
|
||||||
|
CallAssignFrameConfigIfNever();
|
||||||
data->wmWindow.SetVisible(true);
|
data->wmWindow.SetVisible(true);
|
||||||
EnsureNoSystemBorderWhenVisible();
|
EnsureNoSystemBorderWhenVisible();
|
||||||
}
|
}
|
||||||
|
|||||||
+79
-39
@@ -1563,6 +1563,29 @@ INativeWindow
|
|||||||
class DocumentModel;
|
class DocumentModel;
|
||||||
class INativeCursor;
|
class INativeCursor;
|
||||||
class INativeWindowListener;
|
class INativeWindowListener;
|
||||||
|
|
||||||
|
enum class BoolOption
|
||||||
|
{
|
||||||
|
AlwaysTrue,
|
||||||
|
AlwaysFalse,
|
||||||
|
Customizable,
|
||||||
|
};
|
||||||
|
|
||||||
|
struct NativeWindowFrameConfig
|
||||||
|
{
|
||||||
|
BoolOption MaximizedBoxOption = BoolOption::Customizable;
|
||||||
|
BoolOption MinimizedBoxOption = BoolOption::Customizable;
|
||||||
|
BoolOption BorderOption = BoolOption::Customizable;
|
||||||
|
BoolOption SizeBoxOption = BoolOption::Customizable;
|
||||||
|
BoolOption IconVisibleOption = BoolOption::Customizable;
|
||||||
|
BoolOption TitleBarOption = BoolOption::Customizable;
|
||||||
|
BoolOption CustomFrameEnabled = BoolOption::Customizable;
|
||||||
|
|
||||||
|
std::strong_ordering operator<=>(const NativeWindowFrameConfig&) const = default;
|
||||||
|
bool operator==(const NativeWindowFrameConfig&) const = default;
|
||||||
|
|
||||||
|
static const NativeWindowFrameConfig Default;
|
||||||
|
};
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Represents a window.
|
/// Represents a window.
|
||||||
@@ -2258,16 +2281,11 @@ INativeWindow
|
|||||||
/// <param name="cleanBeforeRender">True when the whole render target needs to be cleaned.</param>
|
/// <param name="cleanBeforeRender">True when the whole render target needs to be cleaned.</param>
|
||||||
virtual void ForceRefresh(bool handleFailure, bool& updated, bool& failureByResized, bool& failureByLostDevice);
|
virtual void ForceRefresh(bool handleFailure, bool& updated, bool& failureByResized, bool& failureByLostDevice);
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Called when the window becomes a main window in hosted mode.
|
/// Called when the frame config of a window is decided.
|
||||||
/// This callback is only called once on the main window.
|
/// This callback is only called in hosted mode.
|
||||||
|
/// This callback is only called once on a window.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
virtual void BecomeMainHostedWindow();
|
virtual void AssignFrameConfig(const NativeWindowFrameConfig& config);
|
||||||
/// <summary>
|
|
||||||
/// Called when the window becomes a non-main window in hosted mode.
|
|
||||||
/// It requires MaximizedBox and MinimizedBox to be disabled.
|
|
||||||
/// This callback could be called more than once on a window.
|
|
||||||
/// </summary>
|
|
||||||
virtual void BecomeNonMainHostedWindow();
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
@@ -2762,19 +2780,19 @@ INativeScreenService
|
|||||||
/// Get the number of all available screens.
|
/// Get the number of all available screens.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>The number of all available screens.</returns>
|
/// <returns>The number of all available screens.</returns>
|
||||||
virtual vint GetScreenCount()=0;
|
virtual vint GetScreenCount()=0;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the screen object by a specified screen index.
|
/// Get the screen object by a specified screen index.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>The screen object.</returns>
|
/// <returns>The screen object.</returns>
|
||||||
/// <param name="index">The specified screen index.</param>
|
/// <param name="index">The specified screen index.</param>
|
||||||
virtual INativeScreen* GetScreen(vint index)=0;
|
virtual INativeScreen* GetScreen(vint index)=0;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get the screen object where the main part of the specified window is inside.
|
/// Get the screen object where the main part of the specified window is inside.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>The screen object.</returns>
|
/// <returns>The screen object.</returns>
|
||||||
/// <param name="window">The specified window.</param>
|
/// <param name="window">The specified window.</param>
|
||||||
virtual INativeScreen* GetScreen(INativeWindow* window)=0;
|
virtual INativeScreen* GetScreen(INativeWindow* window)=0;
|
||||||
};
|
};
|
||||||
|
|
||||||
/***********************************************************************
|
/***********************************************************************
|
||||||
@@ -2787,6 +2805,22 @@ INativeWindowService
|
|||||||
class INativeWindowService : public virtual Interface
|
class INativeWindowService : public virtual Interface
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
/// <summary>
|
||||||
|
/// Get the frame configuration for the main window.
|
||||||
|
/// It limit values of frame properties and control template of the main window.
|
||||||
|
/// This function must return "NativeWindowFrameConfig::Default",
|
||||||
|
/// unless it is only designed to be used under hosted mode.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>The frame configuration for the main window.</returns>
|
||||||
|
virtual const NativeWindowFrameConfig& GetMainWindowFrameConfig()=0;
|
||||||
|
/// <summary>
|
||||||
|
/// Get the frame configuration for non-main windows.
|
||||||
|
/// It limit values of frame properties and control template of all non-main windows.
|
||||||
|
/// This function must return "NativeWindowFrameConfig::Default",
|
||||||
|
/// unless it is only designed to be used under hosted mode.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>The frame configuration for non-main windows.</returns>
|
||||||
|
virtual const NativeWindowFrameConfig& GetNonMainWindowFrameConfig()=0;
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Create a window.
|
/// Create a window.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -8574,13 +8608,6 @@ Core Themes
|
|||||||
F(GuiLabelTemplate, GuiControlTemplate) \
|
F(GuiLabelTemplate, GuiControlTemplate) \
|
||||||
F(GuiWindowTemplate, GuiControlTemplate) \
|
F(GuiWindowTemplate, GuiControlTemplate) \
|
||||||
|
|
||||||
enum class BoolOption
|
|
||||||
{
|
|
||||||
AlwaysTrue,
|
|
||||||
AlwaysFalse,
|
|
||||||
Customizable,
|
|
||||||
};
|
|
||||||
|
|
||||||
#define GuiControlTemplate_PROPERTIES(F)\
|
#define GuiControlTemplate_PROPERTIES(F)\
|
||||||
F(GuiControlTemplate, compositions::GuiGraphicsComposition*, ContainerComposition, this)\
|
F(GuiControlTemplate, compositions::GuiGraphicsComposition*, ContainerComposition, this)\
|
||||||
F(GuiControlTemplate, compositions::GuiGraphicsComposition*, FocusableComposition, nullptr)\
|
F(GuiControlTemplate, compositions::GuiGraphicsComposition*, FocusableComposition, nullptr)\
|
||||||
@@ -8626,7 +8653,8 @@ Theme Names
|
|||||||
{
|
{
|
||||||
|
|
||||||
#define GUI_CONTROL_TEMPLATE_TYPES(F) \
|
#define GUI_CONTROL_TEMPLATE_TYPES(F) \
|
||||||
F(WindowTemplate, Window) \
|
F(WindowTemplate, SystemFrameWindow) \
|
||||||
|
F(WindowTemplate, CustomFrameWindow) \
|
||||||
F(ControlTemplate, CustomControl) \
|
F(ControlTemplate, CustomControl) \
|
||||||
F(WindowTemplate, Tooltip) \
|
F(WindowTemplate, Tooltip) \
|
||||||
F(LabelTemplate, Label) \
|
F(LabelTemplate, Label) \
|
||||||
@@ -8689,6 +8717,7 @@ Theme Names
|
|||||||
enum class ThemeName
|
enum class ThemeName
|
||||||
{
|
{
|
||||||
Unknown,
|
Unknown,
|
||||||
|
Window,
|
||||||
#define GUI_DEFINE_THEME_NAME(TEMPLATE, CONTROL) CONTROL,
|
#define GUI_DEFINE_THEME_NAME(TEMPLATE, CONTROL) CONTROL,
|
||||||
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_THEME_NAME)
|
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_THEME_NAME)
|
||||||
#undef GUI_DEFINE_THEME_NAME
|
#undef GUI_DEFINE_THEME_NAME
|
||||||
@@ -9455,6 +9484,7 @@ Window
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
compositions::IGuiAltActionHost* previousAltHost = nullptr;
|
compositions::IGuiAltActionHost* previousAltHost = nullptr;
|
||||||
|
const NativeWindowFrameConfig* frameConfig = nullptr;
|
||||||
bool hasMaximizedBox = true;
|
bool hasMaximizedBox = true;
|
||||||
bool hasMinimizedBox = true;
|
bool hasMinimizedBox = true;
|
||||||
bool hasBorder = true;
|
bool hasBorder = true;
|
||||||
@@ -9465,12 +9495,15 @@ Window
|
|||||||
|
|
||||||
void UpdateIcon(INativeWindow* window, templates::GuiWindowTemplate* ct);
|
void UpdateIcon(INativeWindow* window, templates::GuiWindowTemplate* ct);
|
||||||
void UpdateCustomFramePadding(INativeWindow* window, templates::GuiWindowTemplate* ct);
|
void UpdateCustomFramePadding(INativeWindow* window, templates::GuiWindowTemplate* ct);
|
||||||
void SyncNativeWindowProperties();
|
void SetControlTemplateProperties();
|
||||||
|
void SetNativeWindowFrameProperties();
|
||||||
|
bool ApplyFrameConfigOnVariable(BoolOption frameConfig, BoolOption templateConfig, bool& variable);
|
||||||
|
void ApplyFrameConfig();
|
||||||
|
|
||||||
void Moved()override;
|
void Moved()override;
|
||||||
void Opened()override;
|
void Opened()override;
|
||||||
void DpiChanged(bool preparing)override;
|
void DpiChanged(bool preparing)override;
|
||||||
void BecomeNonMainHostedWindow()override;
|
void AssignFrameConfig(const NativeWindowFrameConfig& config)override;
|
||||||
void OnNativeWindowChanged()override;
|
void OnNativeWindowChanged()override;
|
||||||
void OnVisualStatusChanged()override;
|
void OnVisualStatusChanged()override;
|
||||||
|
|
||||||
@@ -9491,12 +9524,16 @@ Window
|
|||||||
|
|
||||||
/// <summary>Clipboard updated event.</summary>
|
/// <summary>Clipboard updated event.</summary>
|
||||||
compositions::GuiNotifyEvent ClipboardUpdated;
|
compositions::GuiNotifyEvent ClipboardUpdated;
|
||||||
|
/// <summary>Frame configuration changed event.</summary>
|
||||||
|
compositions::GuiNotifyEvent FrameConfigChanged;
|
||||||
|
|
||||||
/// <summary>Move the window to the center of the screen. If multiple screens exist, the window move to the screen that contains the biggest part of the window.</summary>
|
/// <summary>Move the window to the center of the screen. If multiple screens exist, the window move to the screen that contains the biggest part of the window.</summary>
|
||||||
void MoveToScreenCenter();
|
void MoveToScreenCenter();
|
||||||
/// <summary>Move the window to the center of the specified screen.</summary>
|
/// <summary>Move the window to the center of the specified screen.</summary>
|
||||||
/// <param name="screen">The screen.</param>
|
/// <param name="screen">The screen.</param>
|
||||||
void MoveToScreenCenter(INativeScreen* screen);
|
void MoveToScreenCenter(INativeScreen* screen);
|
||||||
|
|
||||||
|
const NativeWindowFrameConfig& GetFrameConfig();
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Test is the maximize box visible.
|
/// Test is the maximize box visible.
|
||||||
@@ -15030,6 +15067,7 @@ namespace vl
|
|||||||
~ThemeTemplates();
|
~ThemeTemplates();
|
||||||
|
|
||||||
WString Name;
|
WString Name;
|
||||||
|
Nullable<bool> PreferCustomFrameWindow;
|
||||||
|
|
||||||
#define GUI_DEFINE_ITEM_PROPERTY(TEMPLATE, CONTROL) TemplateProperty<templates::Gui##TEMPLATE> CONTROL;
|
#define GUI_DEFINE_ITEM_PROPERTY(TEMPLATE, CONTROL) TemplateProperty<templates::Gui##TEMPLATE> CONTROL;
|
||||||
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_ITEM_PROPERTY)
|
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_ITEM_PROPERTY)
|
||||||
@@ -25146,22 +25184,6 @@ GuiHostedController
|
|||||||
void ClipboardUpdated() override;
|
void ClipboardUpdated() override;
|
||||||
void NativeWindowDestroying(INativeWindow* window) override;
|
void NativeWindowDestroying(INativeWindow* window) override;
|
||||||
|
|
||||||
// =============================================================
|
|
||||||
// INativeController
|
|
||||||
// =============================================================
|
|
||||||
|
|
||||||
INativeCallbackService* CallbackService() override;
|
|
||||||
INativeResourceService* ResourceService() override;
|
|
||||||
INativeAsyncService* AsyncService() override;
|
|
||||||
INativeClipboardService* ClipboardService() override;
|
|
||||||
INativeImageService* ImageService() override;
|
|
||||||
INativeInputService* InputService() override;
|
|
||||||
INativeDialogService* DialogService() override;
|
|
||||||
WString GetExecutablePath() override;
|
|
||||||
|
|
||||||
INativeScreenService* ScreenService() override;
|
|
||||||
INativeWindowService* WindowService() override;
|
|
||||||
|
|
||||||
// =============================================================
|
// =============================================================
|
||||||
// INativeAsyncService
|
// INativeAsyncService
|
||||||
// =============================================================
|
// =============================================================
|
||||||
@@ -25195,7 +25217,9 @@ GuiHostedController
|
|||||||
// =============================================================
|
// =============================================================
|
||||||
// INativeWindowService
|
// INativeWindowService
|
||||||
// =============================================================
|
// =============================================================
|
||||||
|
|
||||||
|
const NativeWindowFrameConfig& GetMainWindowFrameConfig() override;
|
||||||
|
const NativeWindowFrameConfig& GetNonMainWindowFrameConfig() override;
|
||||||
INativeWindow* CreateNativeWindow(INativeWindow::WindowMode windowMode) override;
|
INativeWindow* CreateNativeWindow(INativeWindow::WindowMode windowMode) override;
|
||||||
void DestroyNativeWindow(INativeWindow* window) override;
|
void DestroyNativeWindow(INativeWindow* window) override;
|
||||||
INativeWindow* GetMainWindow() override;
|
INativeWindow* GetMainWindow() override;
|
||||||
@@ -25211,6 +25235,22 @@ GuiHostedController
|
|||||||
|
|
||||||
void Initialize();
|
void Initialize();
|
||||||
void Finalize();
|
void Finalize();
|
||||||
|
|
||||||
|
// =============================================================
|
||||||
|
// INativeController
|
||||||
|
// =============================================================
|
||||||
|
|
||||||
|
INativeCallbackService* CallbackService() override;
|
||||||
|
INativeResourceService* ResourceService() override;
|
||||||
|
INativeAsyncService* AsyncService() override;
|
||||||
|
INativeClipboardService* ClipboardService() override;
|
||||||
|
INativeImageService* ImageService() override;
|
||||||
|
INativeInputService* InputService() override;
|
||||||
|
INativeDialogService* DialogService() override;
|
||||||
|
WString GetExecutablePath() override;
|
||||||
|
|
||||||
|
INativeScreenService* ScreenService() override;
|
||||||
|
INativeWindowService* WindowService() override;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1298,6 +1298,7 @@ GuiVrtualTypeInstanceLoader
|
|||||||
{
|
{
|
||||||
#define THEME_NAME_CASE(TEMPLATE, CONTROL) case theme::ThemeName::CONTROL: refExpr->name.value = L ## #CONTROL; break;
|
#define THEME_NAME_CASE(TEMPLATE, CONTROL) case theme::ThemeName::CONTROL: refExpr->name.value = L ## #CONTROL; break;
|
||||||
GUI_CONTROL_TEMPLATE_TYPES(THEME_NAME_CASE)
|
GUI_CONTROL_TEMPLATE_TYPES(THEME_NAME_CASE)
|
||||||
|
THEME_NAME_CASE(WindowTemplate, Window)
|
||||||
#undef THEME_NAME_CASE
|
#undef THEME_NAME_CASE
|
||||||
default:
|
default:
|
||||||
CHECK_FAIL(L"GuiTemplateControlInstanceLoader::CreateThemeName()#Unknown theme name.");
|
CHECK_FAIL(L"GuiTemplateControlInstanceLoader::CreateThemeName()#Unknown theme name.");
|
||||||
|
|||||||
@@ -428,6 +428,22 @@ Type Declaration
|
|||||||
ENUM_NAMESPACE_ITEM(SizeWE)
|
ENUM_NAMESPACE_ITEM(SizeWE)
|
||||||
END_ENUM_ITEM(INativeCursor::SystemCursorType)
|
END_ENUM_ITEM(INativeCursor::SystemCursorType)
|
||||||
|
|
||||||
|
BEGIN_ENUM_ITEM(BoolOption)
|
||||||
|
ENUM_CLASS_ITEM(AlwaysTrue)
|
||||||
|
ENUM_CLASS_ITEM(AlwaysFalse)
|
||||||
|
ENUM_CLASS_ITEM(Customizable)
|
||||||
|
END_ENUM_ITEM(BoolOption)
|
||||||
|
|
||||||
|
BEGIN_STRUCT_MEMBER(NativeWindowFrameConfig)
|
||||||
|
STRUCT_MEMBER(MaximizedBoxOption)
|
||||||
|
STRUCT_MEMBER(MinimizedBoxOption)
|
||||||
|
STRUCT_MEMBER(BorderOption)
|
||||||
|
STRUCT_MEMBER(SizeBoxOption)
|
||||||
|
STRUCT_MEMBER(IconVisibleOption)
|
||||||
|
STRUCT_MEMBER(TitleBarOption)
|
||||||
|
STRUCT_MEMBER(CustomFrameEnabled)
|
||||||
|
END_STRUCT_MEMBER(NativeWindowFrameConfig)
|
||||||
|
|
||||||
BEGIN_INTERFACE_MEMBER_NOPROXY(INativeWindow)
|
BEGIN_INTERFACE_MEMBER_NOPROXY(INativeWindow)
|
||||||
CLASS_MEMBER_PROPERTY_FAST(Bounds)
|
CLASS_MEMBER_PROPERTY_FAST(Bounds)
|
||||||
CLASS_MEMBER_PROPERTY_FAST(ClientSize)
|
CLASS_MEMBER_PROPERTY_FAST(ClientSize)
|
||||||
@@ -1650,6 +1666,9 @@ Type Declaration (Extra)
|
|||||||
END_CLASS_MEMBER(GuiApplication)
|
END_CLASS_MEMBER(GuiApplication)
|
||||||
|
|
||||||
BEGIN_ENUM_ITEM(ThemeName)
|
BEGIN_ENUM_ITEM(ThemeName)
|
||||||
|
ENUM_ITEM_NAMESPACE(ThemeName)
|
||||||
|
ENUM_CLASS_ITEM(Unknown)
|
||||||
|
ENUM_CLASS_ITEM(Window)
|
||||||
#define GUI_DEFINE_THEME_NAME(TEMPLATE, CONTROL) ENUM_CLASS_ITEM(CONTROL)
|
#define GUI_DEFINE_THEME_NAME(TEMPLATE, CONTROL) ENUM_CLASS_ITEM(CONTROL)
|
||||||
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_THEME_NAME)
|
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_THEME_NAME)
|
||||||
#undef GUI_DEFINE_THEME_NAME
|
#undef GUI_DEFINE_THEME_NAME
|
||||||
@@ -1668,6 +1687,7 @@ Type Declaration (Extra)
|
|||||||
CLASS_MEMBER_CONSTRUCTOR(Ptr<ThemeTemplates>(), NO_PARAMETER)
|
CLASS_MEMBER_CONSTRUCTOR(Ptr<ThemeTemplates>(), NO_PARAMETER)
|
||||||
|
|
||||||
CLASS_MEMBER_FIELD(Name)
|
CLASS_MEMBER_FIELD(Name)
|
||||||
|
CLASS_MEMBER_FIELD(PreferCustomFrameWindow)
|
||||||
#define GUI_DEFINE_ITEM_PROPERTY(TEMPLATE, CONTROL) CLASS_MEMBER_FIELD(CONTROL)
|
#define GUI_DEFINE_ITEM_PROPERTY(TEMPLATE, CONTROL) CLASS_MEMBER_FIELD(CONTROL)
|
||||||
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_ITEM_PROPERTY)
|
GUI_CONTROL_TEMPLATE_TYPES(GUI_DEFINE_ITEM_PROPERTY)
|
||||||
#undef GUI_DEFINE_ITEM_PROPERTY
|
#undef GUI_DEFINE_ITEM_PROPERTY
|
||||||
@@ -2466,7 +2486,9 @@ Type Declaration (Class)
|
|||||||
CONTROL_CONSTRUCTOR_CONTROLT_TEMPLATE(GuiWindow)
|
CONTROL_CONSTRUCTOR_CONTROLT_TEMPLATE(GuiWindow)
|
||||||
|
|
||||||
CLASS_MEMBER_GUIEVENT(ClipboardUpdated)
|
CLASS_MEMBER_GUIEVENT(ClipboardUpdated)
|
||||||
|
CLASS_MEMBER_GUIEVENT(FrameConfigChanged)
|
||||||
|
|
||||||
|
CLASS_MEMBER_PROPERTY_EVENT_READONLY_FAST(FrameConfig, FrameConfigChanged)
|
||||||
CLASS_MEMBER_PROPERTY_FAST(MaximizedBox)
|
CLASS_MEMBER_PROPERTY_FAST(MaximizedBox)
|
||||||
CLASS_MEMBER_PROPERTY_FAST(MinimizedBox)
|
CLASS_MEMBER_PROPERTY_FAST(MinimizedBox)
|
||||||
CLASS_MEMBER_PROPERTY_FAST(Border)
|
CLASS_MEMBER_PROPERTY_FAST(Border)
|
||||||
@@ -3652,12 +3674,6 @@ Type Declaration (Extra)
|
|||||||
ENUM_CLASS_ITEM(BottomToTop)
|
ENUM_CLASS_ITEM(BottomToTop)
|
||||||
END_ENUM_ITEM(TabPageOrder)
|
END_ENUM_ITEM(TabPageOrder)
|
||||||
|
|
||||||
BEGIN_ENUM_ITEM(BoolOption)
|
|
||||||
ENUM_CLASS_ITEM(AlwaysTrue)
|
|
||||||
ENUM_CLASS_ITEM(AlwaysFalse)
|
|
||||||
ENUM_CLASS_ITEM(Customizable)
|
|
||||||
END_ENUM_ITEM(BoolOption)
|
|
||||||
|
|
||||||
BEGIN_INTERFACE_MEMBER_NOPROXY(ITextBoxCommandExecutor)
|
BEGIN_INTERFACE_MEMBER_NOPROXY(ITextBoxCommandExecutor)
|
||||||
CLASS_MEMBER_BASE(IDescriptable)
|
CLASS_MEMBER_BASE(IDescriptable)
|
||||||
|
|
||||||
|
|||||||
@@ -132,6 +132,8 @@ Type List (Basic)
|
|||||||
F(presentation::INativeImage::FormatType)\
|
F(presentation::INativeImage::FormatType)\
|
||||||
F(presentation::INativeCursor)\
|
F(presentation::INativeCursor)\
|
||||||
F(presentation::INativeCursor::SystemCursorType)\
|
F(presentation::INativeCursor::SystemCursorType)\
|
||||||
|
F(presentation::BoolOption)\
|
||||||
|
F(presentation::NativeWindowFrameConfig)\
|
||||||
F(presentation::INativeWindow)\
|
F(presentation::INativeWindow)\
|
||||||
F(presentation::INativeWindow::WindowSizeState)\
|
F(presentation::INativeWindow::WindowSizeState)\
|
||||||
F(presentation::INativeWindow::WindowMode)\
|
F(presentation::INativeWindow::WindowMode)\
|
||||||
@@ -316,7 +318,6 @@ Type List (Templates)
|
|||||||
F(presentation::controls::ButtonState)\
|
F(presentation::controls::ButtonState)\
|
||||||
F(presentation::controls::ColumnSortingState)\
|
F(presentation::controls::ColumnSortingState)\
|
||||||
F(presentation::controls::TabPageOrder)\
|
F(presentation::controls::TabPageOrder)\
|
||||||
F(presentation::templates::BoolOption)\
|
|
||||||
F(presentation::controls::ITextBoxCommandExecutor)\
|
F(presentation::controls::ITextBoxCommandExecutor)\
|
||||||
F(presentation::controls::IScrollCommandExecutor)\
|
F(presentation::controls::IScrollCommandExecutor)\
|
||||||
F(presentation::controls::ITabCommandExecutor)\
|
F(presentation::controls::ITabCommandExecutor)\
|
||||||
|
|||||||
+2640
-2561
File diff suppressed because one or more lines are too long
+879
-840
File diff suppressed because it is too large
Load Diff
@@ -48,6 +48,8 @@ namespace vl
|
|||||||
IMPL_CPP_TYPE_INFO(darkskin::ComboBoxTemplateConstructor)
|
IMPL_CPP_TYPE_INFO(darkskin::ComboBoxTemplateConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::CustomControlTemplate)
|
IMPL_CPP_TYPE_INFO(darkskin::CustomControlTemplate)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::CustomControlTemplateConstructor)
|
IMPL_CPP_TYPE_INFO(darkskin::CustomControlTemplateConstructor)
|
||||||
|
IMPL_CPP_TYPE_INFO(darkskin::CustomFrameWindowTemplate)
|
||||||
|
IMPL_CPP_TYPE_INFO(darkskin::CustomFrameWindowTemplateConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::DateButtonTemplate)
|
IMPL_CPP_TYPE_INFO(darkskin::DateButtonTemplate)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::DateButtonTemplateConstructor)
|
IMPL_CPP_TYPE_INFO(darkskin::DateButtonTemplateConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::DatePickerTemplate)
|
IMPL_CPP_TYPE_INFO(darkskin::DatePickerTemplate)
|
||||||
@@ -136,6 +138,8 @@ namespace vl
|
|||||||
IMPL_CPP_TYPE_INFO(darkskin::ShortcutKeyTemplateConstructor)
|
IMPL_CPP_TYPE_INFO(darkskin::ShortcutKeyTemplateConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::SinglelineTextBoxTemplate)
|
IMPL_CPP_TYPE_INFO(darkskin::SinglelineTextBoxTemplate)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::SinglelineTextBoxTemplateConstructor)
|
IMPL_CPP_TYPE_INFO(darkskin::SinglelineTextBoxTemplateConstructor)
|
||||||
|
IMPL_CPP_TYPE_INFO(darkskin::SystemFrameWindowTemplate)
|
||||||
|
IMPL_CPP_TYPE_INFO(darkskin::SystemFrameWindowTemplateConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::TabHeaderButtonTemplate)
|
IMPL_CPP_TYPE_INFO(darkskin::TabHeaderButtonTemplate)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::TabHeaderButtonTemplateConstructor)
|
IMPL_CPP_TYPE_INFO(darkskin::TabHeaderButtonTemplateConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::TabHeaderTemplate)
|
IMPL_CPP_TYPE_INFO(darkskin::TabHeaderTemplate)
|
||||||
@@ -172,8 +176,6 @@ namespace vl
|
|||||||
IMPL_CPP_TYPE_INFO(darkskin::VScrollTemplateConstructor)
|
IMPL_CPP_TYPE_INFO(darkskin::VScrollTemplateConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::VTrackerTemplate)
|
IMPL_CPP_TYPE_INFO(darkskin::VTrackerTemplate)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::VTrackerTemplateConstructor)
|
IMPL_CPP_TYPE_INFO(darkskin::VTrackerTemplateConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::WindowTemplate)
|
|
||||||
IMPL_CPP_TYPE_INFO(darkskin::WindowTemplateConstructor)
|
|
||||||
|
|
||||||
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
||||||
#define _ ,
|
#define _ ,
|
||||||
@@ -278,6 +280,61 @@ namespace vl
|
|||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_0)
|
CLASS_MEMBER_FIELD(__vwsn_precompile_0)
|
||||||
END_CLASS_MEMBER(::darkskin::CustomControlTemplateConstructor)
|
END_CLASS_MEMBER(::darkskin::CustomControlTemplateConstructor)
|
||||||
|
|
||||||
|
BEGIN_CLASS_MEMBER(::darkskin::CustomFrameWindowTemplate)
|
||||||
|
CLASS_MEMBER_BASE(::vl::presentation::templates::GuiWindowTemplate)
|
||||||
|
CLASS_MEMBER_BASE(::darkskin::CustomFrameWindowTemplateConstructor)
|
||||||
|
CLASS_MEMBER_CONSTRUCTOR(::darkskin::CustomFrameWindowTemplate*(), NO_PARAMETER)
|
||||||
|
END_CLASS_MEMBER(::darkskin::CustomFrameWindowTemplate)
|
||||||
|
|
||||||
|
BEGIN_CLASS_MEMBER(::darkskin::CustomFrameWindowTemplateConstructor)
|
||||||
|
CLASS_MEMBER_BASE(::vl::reflection::DescriptableObject)
|
||||||
|
CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::darkskin::CustomFrameWindowTemplateConstructor>(), NO_PARAMETER)
|
||||||
|
CLASS_MEMBER_METHOD(__vwsn_darkskin_CustomFrameWindowTemplate_Initialize, { L"__vwsn_this_" })
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_0)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_1)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_10)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_11)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_12)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_13)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_14)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_15)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_16)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_17)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_18)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_19)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_2)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_20)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_21)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_22)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_23)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_24)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_25)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_26)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_27)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_28)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_29)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_3)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_30)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_31)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_32)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_33)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_34)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_35)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_36)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_37)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_38)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_4)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_5)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_6)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_7)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_8)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_9)
|
||||||
|
CLASS_MEMBER_FIELD(container)
|
||||||
|
CLASS_MEMBER_FIELD(contentTable)
|
||||||
|
CLASS_MEMBER_FIELD(frameTable)
|
||||||
|
CLASS_MEMBER_FIELD(self)
|
||||||
|
END_CLASS_MEMBER(::darkskin::CustomFrameWindowTemplateConstructor)
|
||||||
|
|
||||||
BEGIN_CLASS_MEMBER(::darkskin::DateButtonTemplate)
|
BEGIN_CLASS_MEMBER(::darkskin::DateButtonTemplate)
|
||||||
CLASS_MEMBER_BASE(::vl::presentation::templates::GuiSelectableButtonTemplate)
|
CLASS_MEMBER_BASE(::vl::presentation::templates::GuiSelectableButtonTemplate)
|
||||||
CLASS_MEMBER_BASE(::darkskin::DateButtonTemplateConstructor)
|
CLASS_MEMBER_BASE(::darkskin::DateButtonTemplateConstructor)
|
||||||
@@ -1128,6 +1185,21 @@ namespace vl
|
|||||||
CLASS_MEMBER_FIELD(self)
|
CLASS_MEMBER_FIELD(self)
|
||||||
END_CLASS_MEMBER(::darkskin::SinglelineTextBoxTemplateConstructor)
|
END_CLASS_MEMBER(::darkskin::SinglelineTextBoxTemplateConstructor)
|
||||||
|
|
||||||
|
BEGIN_CLASS_MEMBER(::darkskin::SystemFrameWindowTemplate)
|
||||||
|
CLASS_MEMBER_BASE(::vl::presentation::templates::GuiWindowTemplate)
|
||||||
|
CLASS_MEMBER_BASE(::darkskin::SystemFrameWindowTemplateConstructor)
|
||||||
|
CLASS_MEMBER_CONSTRUCTOR(::darkskin::SystemFrameWindowTemplate*(), NO_PARAMETER)
|
||||||
|
END_CLASS_MEMBER(::darkskin::SystemFrameWindowTemplate)
|
||||||
|
|
||||||
|
BEGIN_CLASS_MEMBER(::darkskin::SystemFrameWindowTemplateConstructor)
|
||||||
|
CLASS_MEMBER_BASE(::vl::reflection::DescriptableObject)
|
||||||
|
CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::darkskin::SystemFrameWindowTemplateConstructor>(), NO_PARAMETER)
|
||||||
|
CLASS_MEMBER_METHOD(__vwsn_darkskin_SystemFrameWindowTemplate_Initialize, { L"__vwsn_this_" })
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_0)
|
||||||
|
CLASS_MEMBER_FIELD(__vwsn_precompile_1)
|
||||||
|
CLASS_MEMBER_FIELD(container)
|
||||||
|
END_CLASS_MEMBER(::darkskin::SystemFrameWindowTemplateConstructor)
|
||||||
|
|
||||||
BEGIN_CLASS_MEMBER(::darkskin::TabHeaderButtonTemplate)
|
BEGIN_CLASS_MEMBER(::darkskin::TabHeaderButtonTemplate)
|
||||||
CLASS_MEMBER_BASE(::vl::presentation::templates::GuiSelectableButtonTemplate)
|
CLASS_MEMBER_BASE(::vl::presentation::templates::GuiSelectableButtonTemplate)
|
||||||
CLASS_MEMBER_BASE(::darkskin::TabHeaderButtonTemplateConstructor)
|
CLASS_MEMBER_BASE(::darkskin::TabHeaderButtonTemplateConstructor)
|
||||||
@@ -1486,61 +1558,6 @@ namespace vl
|
|||||||
CLASS_MEMBER_FIELD(self)
|
CLASS_MEMBER_FIELD(self)
|
||||||
END_CLASS_MEMBER(::darkskin::VTrackerTemplateConstructor)
|
END_CLASS_MEMBER(::darkskin::VTrackerTemplateConstructor)
|
||||||
|
|
||||||
BEGIN_CLASS_MEMBER(::darkskin::WindowTemplate)
|
|
||||||
CLASS_MEMBER_BASE(::vl::presentation::templates::GuiWindowTemplate)
|
|
||||||
CLASS_MEMBER_BASE(::darkskin::WindowTemplateConstructor)
|
|
||||||
CLASS_MEMBER_CONSTRUCTOR(::darkskin::WindowTemplate*(), NO_PARAMETER)
|
|
||||||
END_CLASS_MEMBER(::darkskin::WindowTemplate)
|
|
||||||
|
|
||||||
BEGIN_CLASS_MEMBER(::darkskin::WindowTemplateConstructor)
|
|
||||||
CLASS_MEMBER_BASE(::vl::reflection::DescriptableObject)
|
|
||||||
CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::darkskin::WindowTemplateConstructor>(), NO_PARAMETER)
|
|
||||||
CLASS_MEMBER_METHOD(__vwsn_darkskin_WindowTemplate_Initialize, { L"__vwsn_this_" })
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_0)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_1)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_10)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_11)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_12)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_13)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_14)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_15)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_16)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_17)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_18)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_19)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_2)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_20)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_21)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_22)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_23)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_24)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_25)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_26)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_27)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_28)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_29)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_3)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_30)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_31)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_32)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_33)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_34)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_35)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_36)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_37)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_38)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_4)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_5)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_6)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_7)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_8)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_9)
|
|
||||||
CLASS_MEMBER_FIELD(container)
|
|
||||||
CLASS_MEMBER_FIELD(contentTable)
|
|
||||||
CLASS_MEMBER_FIELD(frameTable)
|
|
||||||
CLASS_MEMBER_FIELD(self)
|
|
||||||
END_CLASS_MEMBER(::darkskin::WindowTemplateConstructor)
|
|
||||||
|
|
||||||
#undef _
|
#undef _
|
||||||
class DarkSkinTypeLoader : public Object, public ITypeLoader
|
class DarkSkinTypeLoader : public Object, public ITypeLoader
|
||||||
{
|
{
|
||||||
@@ -1557,6 +1574,8 @@ namespace vl
|
|||||||
ADD_TYPE_INFO(::darkskin::ComboBoxTemplateConstructor)
|
ADD_TYPE_INFO(::darkskin::ComboBoxTemplateConstructor)
|
||||||
ADD_TYPE_INFO(::darkskin::CustomControlTemplate)
|
ADD_TYPE_INFO(::darkskin::CustomControlTemplate)
|
||||||
ADD_TYPE_INFO(::darkskin::CustomControlTemplateConstructor)
|
ADD_TYPE_INFO(::darkskin::CustomControlTemplateConstructor)
|
||||||
|
ADD_TYPE_INFO(::darkskin::CustomFrameWindowTemplate)
|
||||||
|
ADD_TYPE_INFO(::darkskin::CustomFrameWindowTemplateConstructor)
|
||||||
ADD_TYPE_INFO(::darkskin::DateButtonTemplate)
|
ADD_TYPE_INFO(::darkskin::DateButtonTemplate)
|
||||||
ADD_TYPE_INFO(::darkskin::DateButtonTemplateConstructor)
|
ADD_TYPE_INFO(::darkskin::DateButtonTemplateConstructor)
|
||||||
ADD_TYPE_INFO(::darkskin::DatePickerTemplate)
|
ADD_TYPE_INFO(::darkskin::DatePickerTemplate)
|
||||||
@@ -1645,6 +1664,8 @@ namespace vl
|
|||||||
ADD_TYPE_INFO(::darkskin::ShortcutKeyTemplateConstructor)
|
ADD_TYPE_INFO(::darkskin::ShortcutKeyTemplateConstructor)
|
||||||
ADD_TYPE_INFO(::darkskin::SinglelineTextBoxTemplate)
|
ADD_TYPE_INFO(::darkskin::SinglelineTextBoxTemplate)
|
||||||
ADD_TYPE_INFO(::darkskin::SinglelineTextBoxTemplateConstructor)
|
ADD_TYPE_INFO(::darkskin::SinglelineTextBoxTemplateConstructor)
|
||||||
|
ADD_TYPE_INFO(::darkskin::SystemFrameWindowTemplate)
|
||||||
|
ADD_TYPE_INFO(::darkskin::SystemFrameWindowTemplateConstructor)
|
||||||
ADD_TYPE_INFO(::darkskin::TabHeaderButtonTemplate)
|
ADD_TYPE_INFO(::darkskin::TabHeaderButtonTemplate)
|
||||||
ADD_TYPE_INFO(::darkskin::TabHeaderButtonTemplateConstructor)
|
ADD_TYPE_INFO(::darkskin::TabHeaderButtonTemplateConstructor)
|
||||||
ADD_TYPE_INFO(::darkskin::TabHeaderTemplate)
|
ADD_TYPE_INFO(::darkskin::TabHeaderTemplate)
|
||||||
@@ -1681,8 +1702,6 @@ namespace vl
|
|||||||
ADD_TYPE_INFO(::darkskin::VScrollTemplateConstructor)
|
ADD_TYPE_INFO(::darkskin::VScrollTemplateConstructor)
|
||||||
ADD_TYPE_INFO(::darkskin::VTrackerTemplate)
|
ADD_TYPE_INFO(::darkskin::VTrackerTemplate)
|
||||||
ADD_TYPE_INFO(::darkskin::VTrackerTemplateConstructor)
|
ADD_TYPE_INFO(::darkskin::VTrackerTemplateConstructor)
|
||||||
ADD_TYPE_INFO(::darkskin::WindowTemplate)
|
|
||||||
ADD_TYPE_INFO(::darkskin::WindowTemplateConstructor)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Unload(ITypeManager* manager)
|
void Unload(ITypeManager* manager)
|
||||||
|
|||||||
@@ -61,6 +61,8 @@ namespace vl
|
|||||||
DECL_TYPE_INFO(::darkskin::ComboBoxTemplateConstructor)
|
DECL_TYPE_INFO(::darkskin::ComboBoxTemplateConstructor)
|
||||||
DECL_TYPE_INFO(::darkskin::CustomControlTemplate)
|
DECL_TYPE_INFO(::darkskin::CustomControlTemplate)
|
||||||
DECL_TYPE_INFO(::darkskin::CustomControlTemplateConstructor)
|
DECL_TYPE_INFO(::darkskin::CustomControlTemplateConstructor)
|
||||||
|
DECL_TYPE_INFO(::darkskin::CustomFrameWindowTemplate)
|
||||||
|
DECL_TYPE_INFO(::darkskin::CustomFrameWindowTemplateConstructor)
|
||||||
DECL_TYPE_INFO(::darkskin::DateButtonTemplate)
|
DECL_TYPE_INFO(::darkskin::DateButtonTemplate)
|
||||||
DECL_TYPE_INFO(::darkskin::DateButtonTemplateConstructor)
|
DECL_TYPE_INFO(::darkskin::DateButtonTemplateConstructor)
|
||||||
DECL_TYPE_INFO(::darkskin::DatePickerTemplate)
|
DECL_TYPE_INFO(::darkskin::DatePickerTemplate)
|
||||||
@@ -149,6 +151,8 @@ namespace vl
|
|||||||
DECL_TYPE_INFO(::darkskin::ShortcutKeyTemplateConstructor)
|
DECL_TYPE_INFO(::darkskin::ShortcutKeyTemplateConstructor)
|
||||||
DECL_TYPE_INFO(::darkskin::SinglelineTextBoxTemplate)
|
DECL_TYPE_INFO(::darkskin::SinglelineTextBoxTemplate)
|
||||||
DECL_TYPE_INFO(::darkskin::SinglelineTextBoxTemplateConstructor)
|
DECL_TYPE_INFO(::darkskin::SinglelineTextBoxTemplateConstructor)
|
||||||
|
DECL_TYPE_INFO(::darkskin::SystemFrameWindowTemplate)
|
||||||
|
DECL_TYPE_INFO(::darkskin::SystemFrameWindowTemplateConstructor)
|
||||||
DECL_TYPE_INFO(::darkskin::TabHeaderButtonTemplate)
|
DECL_TYPE_INFO(::darkskin::TabHeaderButtonTemplate)
|
||||||
DECL_TYPE_INFO(::darkskin::TabHeaderButtonTemplateConstructor)
|
DECL_TYPE_INFO(::darkskin::TabHeaderButtonTemplateConstructor)
|
||||||
DECL_TYPE_INFO(::darkskin::TabHeaderTemplate)
|
DECL_TYPE_INFO(::darkskin::TabHeaderTemplate)
|
||||||
@@ -185,8 +189,6 @@ namespace vl
|
|||||||
DECL_TYPE_INFO(::darkskin::VScrollTemplateConstructor)
|
DECL_TYPE_INFO(::darkskin::VScrollTemplateConstructor)
|
||||||
DECL_TYPE_INFO(::darkskin::VTrackerTemplate)
|
DECL_TYPE_INFO(::darkskin::VTrackerTemplate)
|
||||||
DECL_TYPE_INFO(::darkskin::VTrackerTemplateConstructor)
|
DECL_TYPE_INFO(::darkskin::VTrackerTemplateConstructor)
|
||||||
DECL_TYPE_INFO(::darkskin::WindowTemplate)
|
|
||||||
DECL_TYPE_INFO(::darkskin::WindowTemplateConstructor)
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern bool LoadDarkSkinTypes();
|
extern bool LoadDarkSkinTypes();
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -86,7 +86,10 @@
|
|||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="Main.cpp" />
|
<ClCompile Include="Main.cpp" />
|
||||||
<ClCompile Include="UI\FullControlTest\Source\DemoPartialClasses.cpp" />
|
<ClCompile Include="UI\FullControlTest\Source\DemoPartialClasses.cpp">
|
||||||
|
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
<AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/bigobj %(AdditionalOptions)</AdditionalOptions>
|
||||||
|
</ClCompile>
|
||||||
<ClCompile Include="UI\FullControlTest\Source\DocumentEditorBase.cpp" />
|
<ClCompile Include="UI\FullControlTest\Source\DocumentEditorBase.cpp" />
|
||||||
<ClCompile Include="UI\FullControlTest\Source\MainWindow.cpp" />
|
<ClCompile Include="UI\FullControlTest\Source\MainWindow.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|||||||
@@ -8,18 +8,10 @@
|
|||||||
</Folder>
|
</Folder>
|
||||||
</Folder>
|
</Folder>
|
||||||
|
|
||||||
<Instance name="SystemFrameWindowTemplateResource">
|
|
||||||
<Instance ref.CodeBehind="false" ref.Class="demo::SystemFrameWindowTemplate">
|
|
||||||
<WindowTemplate ContainerComposition-ref="container" CustomFrameEnabled="false" MinSizeLimitation="LimitToElementAndChildren">
|
|
||||||
<SolidBackground Color="#2D2D30"/>
|
|
||||||
<Bounds ref.Name="container" AlignmentToParent="left:0 top:0 right:0 bottom:0" MinSizeLimitation="LimitToElementAndChildren"/>
|
|
||||||
</WindowTemplate>
|
|
||||||
</Instance>
|
|
||||||
</Instance>
|
|
||||||
|
|
||||||
<InstanceStyle name="WindowManagerContentStyles">
|
<InstanceStyle name="WindowManagerContentStyles">
|
||||||
<Styles>
|
<Styles>
|
||||||
<Style ref.Path="//Window"
|
<Style ref.Path="//Window"
|
||||||
|
ControlThemeName="CustomFrameWindow"
|
||||||
MaximizedBox-bind="checkMax.Selected"
|
MaximizedBox-bind="checkMax.Selected"
|
||||||
MinimizedBox-bind="checkMin.Selected"
|
MinimizedBox-bind="checkMin.Selected"
|
||||||
Border-bind="checkBorder.Selected"
|
Border-bind="checkBorder.Selected"
|
||||||
@@ -30,44 +22,37 @@
|
|||||||
|
|
||||||
<Style ref.Path="//*.windowManagerContent" Direction="Vertical" AlignmentToParent="left:5 top:5 right:5 bottom:5" Padding="5" MinSizeLimitation="LimitToElementAndChildren">
|
<Style ref.Path="//*.windowManagerContent" Direction="Vertical" AlignmentToParent="left:5 top:5 right:5 bottom:5" Padding="5" MinSizeLimitation="LimitToElementAndChildren">
|
||||||
<StackItem>
|
<StackItem>
|
||||||
<CheckBox Selected="true" ref.Name="checkFrame" Text="Customized Frame">
|
<CheckBox ref.Name="checkFrame" Text="Customized Frame" Selected-eval="self.ControlThemeName == ThemeName::CustomFrameWindow" Enabled-bind="self.FrameConfig.CustomFrameEnabled == BoolOption::Customizable">
|
||||||
<ev.SelectedChanged-eval>
|
<ev.SelectedChanged-eval><![CDATA[
|
||||||
<![CDATA[
|
{
|
||||||
{
|
if (checkFrame.Selected)
|
||||||
if (checkFrame.Selected)
|
{
|
||||||
{
|
self.ControlThemeName = CustomFrameWindow;
|
||||||
self.ControlTemplate = null;
|
}
|
||||||
}
|
else
|
||||||
else
|
{
|
||||||
{
|
self.ControlThemeName = SystemFrameWindow;
|
||||||
self.ControlTemplate = func(context: object): GuiControlTemplate*
|
}
|
||||||
{
|
}
|
||||||
return new SystemFrameWindowTemplate*();
|
]]></ev.SelectedChanged-eval>
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]]>
|
|
||||||
</ev.SelectedChanged-eval>
|
|
||||||
</CheckBox>
|
</CheckBox>
|
||||||
</StackItem>
|
</StackItem>
|
||||||
<StackItem><CheckBox Selected="true" ref.Name="checkMax" Text="MaximizedBox"/></StackItem>
|
<StackItem><CheckBox ref.Name="checkMax" Text="MaximizedBox" Selected-eval="self.MaximizedBox" Enabled-bind="self.FrameConfig.MaximizedBoxOption == BoolOption::Customizable" /></StackItem>
|
||||||
<StackItem><CheckBox Selected="true" ref.Name="checkMin" Text="MinimizedBox"/></StackItem>
|
<StackItem><CheckBox ref.Name="checkMin" Text="MinimizedBox" Selected-eval="self.MinimizedBox" Enabled-bind="self.FrameConfig.MinimizedBoxOption == BoolOption::Customizable" /></StackItem>
|
||||||
<StackItem><CheckBox Selected="true" ref.Name="checkBorder" Text="Border"/></StackItem>
|
<StackItem><CheckBox ref.Name="checkBorder" Text="Border" Selected-eval="self.Border" Enabled-bind="self.FrameConfig.BorderOption == BoolOption::Customizable" /></StackItem>
|
||||||
<StackItem><CheckBox Selected="true" ref.Name="checkSizeBox" Text="SizeBox"/></StackItem>
|
<StackItem><CheckBox ref.Name="checkSizeBox" Text="SizeBox" Selected-eval="self.SizeBox" Enabled-bind="self.FrameConfig.SizeBoxOption == BoolOption::Customizable" /></StackItem>
|
||||||
<StackItem><CheckBox Selected="true" ref.Name="checkIcon" Text="IconVisible"/></StackItem>
|
<StackItem><CheckBox ref.Name="checkIcon" Text="IconVisible" Selected-eval="self.IconVisible" Enabled-bind="self.FrameConfig.IconVisibleOption == BoolOption::Customizable" /></StackItem>
|
||||||
<StackItem><CheckBox Selected="true" ref.Name="checkTitle" Text="TitleBar"/></StackItem>
|
<StackItem><CheckBox ref.Name="checkTitle" Text="TitleBar" Selected-eval="self.TitleBar" Enabled-bind="self.FrameConfig.TitleBarOption == BoolOption::Customizable" /></StackItem>
|
||||||
<StackItem>
|
<StackItem>
|
||||||
<Button Text="Open New Window">
|
<Button Text="Open New Window">
|
||||||
<ev.Clicked-eval>
|
<ev.Clicked-eval><![CDATA[
|
||||||
<![CDATA[
|
{
|
||||||
{
|
var subWindow = new SubWindow*();
|
||||||
var subWindow = new SubWindow*();
|
self.openedSubWindows.Add(cast (SubWindow^) subWindow);
|
||||||
self.openedSubWindows.Add(cast (SubWindow^) subWindow);
|
subWindow.MoveToScreenCenter();
|
||||||
subWindow.MoveToScreenCenter();
|
subWindow.ShowWithOwner(self);
|
||||||
subWindow.ShowWithOwner(self);
|
}
|
||||||
}
|
]]></ev.Clicked-eval>
|
||||||
]]>
|
|
||||||
</ev.Clicked-eval>
|
|
||||||
</Button>
|
</Button>
|
||||||
</StackItem>
|
</StackItem>
|
||||||
</Style>
|
</Style>
|
||||||
|
|||||||
+7981
-6882
File diff suppressed because it is too large
Load Diff
+3127
-2729
File diff suppressed because it is too large
Load Diff
+26
-26
@@ -27,32 +27,32 @@ namespace demo
|
|||||||
{
|
{
|
||||||
class DocumentEditorRibbon : public ::demo::DocumentEditorBase, public ::demo::DocumentEditorRibbonConstructor, public ::vl::reflection::Description<DocumentEditorRibbon>
|
class DocumentEditorRibbon : public ::demo::DocumentEditorBase, public ::demo::DocumentEditorRibbonConstructor, public ::vl::reflection::Description<DocumentEditorRibbon>
|
||||||
{
|
{
|
||||||
friend struct ::vl_workflow_global::__vwsnf204_Demo_demo_DocumentEditorRibbon___vwsn_instance_ctor__;
|
friend struct ::vl_workflow_global::__vwsnf216_Demo_demo_DocumentEditorRibbon___vwsn_instance_ctor__;
|
||||||
friend class ::demo::DocumentEditorRibbonConstructor;
|
friend class ::demo::DocumentEditorRibbonConstructor;
|
||||||
friend class ::vl_workflow_global::__vwsnc84_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc100_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc85_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc101_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc86_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc102_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc87_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc103_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc88_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc104_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc89_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc105_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc90_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc106_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc91_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc98_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc92_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc99_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf189_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf190_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf191_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf192_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf193_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf194_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf195_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf196_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf197_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf198_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf199_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf200_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
|
||||||
friend struct ::vl_workflow_global::__vwsnf201_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf201_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf202_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf202_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf203_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf203_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf204_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf205_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf206_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf207_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf208_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf209_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf210_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf211_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf212_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf213_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf214_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf215_Demo_demo_DocumentEditorRibbonConstructor___vwsn_demo_DocumentEditorRibbon_Initialize_;
|
||||||
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
||||||
friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<DocumentEditorRibbon>;
|
friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<DocumentEditorRibbon>;
|
||||||
#endif
|
#endif
|
||||||
@@ -84,10 +84,10 @@ namespace demo
|
|||||||
class DocumentEditorToolstrip : public ::demo::DocumentEditorBase, public ::demo::DocumentEditorToolstripConstructor, public ::vl::reflection::Description<DocumentEditorToolstrip>
|
class DocumentEditorToolstrip : public ::demo::DocumentEditorBase, public ::demo::DocumentEditorToolstripConstructor, public ::vl::reflection::Description<DocumentEditorToolstrip>
|
||||||
{
|
{
|
||||||
friend class ::demo::DocumentEditorToolstripConstructor;
|
friend class ::demo::DocumentEditorToolstripConstructor;
|
||||||
friend class ::vl_workflow_global::__vwsnc96_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc110_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc97_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc111_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf208_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf220_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf209_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf221_Demo_demo_DocumentEditorToolstripConstructor___vwsn_demo_DocumentEditorToolstrip_Initialize_;
|
||||||
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
||||||
friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<DocumentEditorToolstrip>;
|
friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<DocumentEditorToolstrip>;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -121,8 +121,6 @@ namespace vl
|
|||||||
IMPL_CPP_TYPE_INFO(demo::StyleItemTemplateConstructor)
|
IMPL_CPP_TYPE_INFO(demo::StyleItemTemplateConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(demo::SubWindow)
|
IMPL_CPP_TYPE_INFO(demo::SubWindow)
|
||||||
IMPL_CPP_TYPE_INFO(demo::SubWindowConstructor)
|
IMPL_CPP_TYPE_INFO(demo::SubWindowConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(demo::SystemFrameWindowTemplate)
|
|
||||||
IMPL_CPP_TYPE_INFO(demo::SystemFrameWindowTemplateConstructor)
|
|
||||||
IMPL_CPP_TYPE_INFO(demo::TextBoxSubTabPage)
|
IMPL_CPP_TYPE_INFO(demo::TextBoxSubTabPage)
|
||||||
IMPL_CPP_TYPE_INFO(demo::TextBoxSubTabPageConstructor)
|
IMPL_CPP_TYPE_INFO(demo::TextBoxSubTabPageConstructor)
|
||||||
IMPL_CPP_TYPE_INFO(demo::TextBoxTabPage)
|
IMPL_CPP_TYPE_INFO(demo::TextBoxTabPage)
|
||||||
@@ -1851,21 +1849,6 @@ namespace vl
|
|||||||
CLASS_MEMBER_FIELD(self)
|
CLASS_MEMBER_FIELD(self)
|
||||||
END_CLASS_MEMBER(::demo::SubWindowConstructor)
|
END_CLASS_MEMBER(::demo::SubWindowConstructor)
|
||||||
|
|
||||||
BEGIN_CLASS_MEMBER(::demo::SystemFrameWindowTemplate)
|
|
||||||
CLASS_MEMBER_BASE(::vl::presentation::templates::GuiWindowTemplate)
|
|
||||||
CLASS_MEMBER_BASE(::demo::SystemFrameWindowTemplateConstructor)
|
|
||||||
CLASS_MEMBER_CONSTRUCTOR(::demo::SystemFrameWindowTemplate*(), NO_PARAMETER)
|
|
||||||
END_CLASS_MEMBER(::demo::SystemFrameWindowTemplate)
|
|
||||||
|
|
||||||
BEGIN_CLASS_MEMBER(::demo::SystemFrameWindowTemplateConstructor)
|
|
||||||
CLASS_MEMBER_BASE(::vl::reflection::DescriptableObject)
|
|
||||||
CLASS_MEMBER_CONSTRUCTOR(::vl::Ptr<::demo::SystemFrameWindowTemplateConstructor>(), NO_PARAMETER)
|
|
||||||
CLASS_MEMBER_METHOD(__vwsn_demo_SystemFrameWindowTemplate_Initialize, { L"__vwsn_this_" })
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_0)
|
|
||||||
CLASS_MEMBER_FIELD(__vwsn_precompile_1)
|
|
||||||
CLASS_MEMBER_FIELD(container)
|
|
||||||
END_CLASS_MEMBER(::demo::SystemFrameWindowTemplateConstructor)
|
|
||||||
|
|
||||||
BEGIN_CLASS_MEMBER(::demo::TextBoxSubTabPage)
|
BEGIN_CLASS_MEMBER(::demo::TextBoxSubTabPage)
|
||||||
CLASS_MEMBER_BASE(::vl::presentation::controls::GuiTabPage)
|
CLASS_MEMBER_BASE(::vl::presentation::controls::GuiTabPage)
|
||||||
CLASS_MEMBER_BASE(::demo::TextBoxSubTabPageConstructor)
|
CLASS_MEMBER_BASE(::demo::TextBoxSubTabPageConstructor)
|
||||||
@@ -2164,8 +2147,6 @@ namespace vl
|
|||||||
ADD_TYPE_INFO(::demo::StyleItemTemplateConstructor)
|
ADD_TYPE_INFO(::demo::StyleItemTemplateConstructor)
|
||||||
ADD_TYPE_INFO(::demo::SubWindow)
|
ADD_TYPE_INFO(::demo::SubWindow)
|
||||||
ADD_TYPE_INFO(::demo::SubWindowConstructor)
|
ADD_TYPE_INFO(::demo::SubWindowConstructor)
|
||||||
ADD_TYPE_INFO(::demo::SystemFrameWindowTemplate)
|
|
||||||
ADD_TYPE_INFO(::demo::SystemFrameWindowTemplateConstructor)
|
|
||||||
ADD_TYPE_INFO(::demo::TextBoxSubTabPage)
|
ADD_TYPE_INFO(::demo::TextBoxSubTabPage)
|
||||||
ADD_TYPE_INFO(::demo::TextBoxSubTabPageConstructor)
|
ADD_TYPE_INFO(::demo::TextBoxSubTabPageConstructor)
|
||||||
ADD_TYPE_INFO(::demo::TextBoxTabPage)
|
ADD_TYPE_INFO(::demo::TextBoxTabPage)
|
||||||
|
|||||||
@@ -124,8 +124,6 @@ namespace vl
|
|||||||
DECL_TYPE_INFO(::demo::StyleItemTemplateConstructor)
|
DECL_TYPE_INFO(::demo::StyleItemTemplateConstructor)
|
||||||
DECL_TYPE_INFO(::demo::SubWindow)
|
DECL_TYPE_INFO(::demo::SubWindow)
|
||||||
DECL_TYPE_INFO(::demo::SubWindowConstructor)
|
DECL_TYPE_INFO(::demo::SubWindowConstructor)
|
||||||
DECL_TYPE_INFO(::demo::SystemFrameWindowTemplate)
|
|
||||||
DECL_TYPE_INFO(::demo::SystemFrameWindowTemplateConstructor)
|
|
||||||
DECL_TYPE_INFO(::demo::TextBoxSubTabPage)
|
DECL_TYPE_INFO(::demo::TextBoxSubTabPage)
|
||||||
DECL_TYPE_INFO(::demo::TextBoxSubTabPageConstructor)
|
DECL_TYPE_INFO(::demo::TextBoxSubTabPageConstructor)
|
||||||
DECL_TYPE_INFO(::demo::TextBoxTabPage)
|
DECL_TYPE_INFO(::demo::TextBoxTabPage)
|
||||||
|
|||||||
+29
-29
@@ -27,20 +27,6 @@ namespace demo
|
|||||||
class DocumentEditorBase : public ::vl::presentation::controls::GuiCustomControl, public ::demo::DocumentEditorBaseConstructor, public ::vl::reflection::Description<DocumentEditorBase>
|
class DocumentEditorBase : public ::vl::presentation::controls::GuiCustomControl, public ::demo::DocumentEditorBaseConstructor, public ::vl::reflection::Description<DocumentEditorBase>
|
||||||
{
|
{
|
||||||
friend class ::demo::DocumentEditorBaseConstructor;
|
friend class ::demo::DocumentEditorBaseConstructor;
|
||||||
friend class ::vl_workflow_global::__vwsnc54_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc55_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc56_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc57_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc58_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc59_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc60_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc61_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc62_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc63_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize____vl_reflection_description_ICoroutine;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc64_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc65_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc66_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc67_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
|
||||||
friend class ::vl_workflow_global::__vwsnc68_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc68_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc69_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc69_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc70_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc70_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
@@ -50,25 +36,27 @@ namespace demo
|
|||||||
friend class ::vl_workflow_global::__vwsnc74_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc74_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc75_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc75_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc76_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc76_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc77_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc77_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize____vl_reflection_description_ICoroutine;
|
||||||
friend class ::vl_workflow_global::__vwsnc78_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc78_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc79_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc79_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc80_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc80_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc81_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc81_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc82_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc82_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc83_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc83_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf130_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc84_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf131_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc85_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf132_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc86_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf133_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc87_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf134_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc88_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf135_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc89_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf136_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc90_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf137_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc91_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf138_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc92_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf139_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc93_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf140_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc94_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf141_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend class ::vl_workflow_global::__vwsnc95_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
|
friend class ::vl_workflow_global::__vwsnc96_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
|
friend class ::vl_workflow_global::__vwsnc97_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend struct ::vl_workflow_global::__vwsnf142_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf142_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf143_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf143_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf144_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf144_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
@@ -80,7 +68,7 @@ namespace demo
|
|||||||
friend struct ::vl_workflow_global::__vwsnf150_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf150_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf151_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf151_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf152_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf152_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf153_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__;
|
friend struct ::vl_workflow_global::__vwsnf153_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf154_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf154_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf155_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf155_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf156_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf156_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
@@ -92,7 +80,7 @@ namespace demo
|
|||||||
friend struct ::vl_workflow_global::__vwsnf162_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf162_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf163_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf163_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf164_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf164_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf165_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf165_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize__;
|
||||||
friend struct ::vl_workflow_global::__vwsnf166_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf166_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf167_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf167_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf168_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf168_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
@@ -116,6 +104,18 @@ namespace demo
|
|||||||
friend struct ::vl_workflow_global::__vwsnf186_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf186_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf187_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf187_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf188_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf188_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf189_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf190_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf191_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf192_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf193_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf194_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf195_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf196_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf197_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf198_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf199_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf200_Demo_demo_DocumentEditorBaseConstructor___vwsn_demo_DocumentEditorBase_Initialize_;
|
||||||
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
||||||
friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<DocumentEditorBase>;
|
friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<DocumentEditorBase>;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -31,6 +31,13 @@ namespace demo
|
|||||||
friend class ::vl_workflow_global::__vwsnc11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc11_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc12_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc12_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc13_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc13_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
|
friend class ::vl_workflow_global::__vwsnc14_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
|
friend class ::vl_workflow_global::__vwsnc15_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
|
friend class ::vl_workflow_global::__vwsnc16_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
|
friend class ::vl_workflow_global::__vwsnc17_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
|
friend class ::vl_workflow_global::__vwsnc18_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
|
friend class ::vl_workflow_global::__vwsnc19_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
|
friend class ::vl_workflow_global::__vwsnc20_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc6_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc7_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
friend class ::vl_workflow_global::__vwsnc8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
friend class ::vl_workflow_global::__vwsnc8_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__vl_reflection_description_IValueSubscription;
|
||||||
@@ -38,7 +45,7 @@ namespace demo
|
|||||||
friend struct ::vl_workflow_global::__vwsnf44_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf44_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf45_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf45_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf46_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf46_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf47_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize__;
|
friend struct ::vl_workflow_global::__vwsnf47_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf48_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf48_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf49_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf49_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf50_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf50_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
@@ -46,6 +53,12 @@ namespace demo
|
|||||||
friend struct ::vl_workflow_global::__vwsnf52_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf52_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf53_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf53_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
friend struct ::vl_workflow_global::__vwsnf54_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
friend struct ::vl_workflow_global::__vwsnf54_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf55_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf56_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf57_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf58_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf59_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
|
friend struct ::vl_workflow_global::__vwsnf60_Demo_demo_MainWindowConstructor___vwsn_demo_MainWindow_Initialize_;
|
||||||
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
#ifdef VCZH_DESCRIPTABLEOBJECT_WITH_METADATA
|
||||||
friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<MainWindow>;
|
friend struct ::vl::reflection::description::CustomTypeDescriptorSelector<MainWindow>;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Binary file not shown.
@@ -42,17 +42,11 @@ namespace demo
|
|||||||
{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
|
{/* USER_CONTENT_BEGIN(::demo::MainWindow) */
|
||||||
if (checkFrame->GetSelected())
|
if (checkFrame->GetSelected())
|
||||||
{
|
{
|
||||||
SetControlTemplate([](const vl::reflection::description::Value&)->vl::presentation::templates::GuiControlTemplate*
|
SetControlThemeName(vl::presentation::theme::ThemeName::CustomFrameWindow);
|
||||||
{
|
|
||||||
return new darkskin::WindowTemplate();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SetControlTemplate([](const vl::reflection::description::Value&)->vl::presentation::templates::GuiControlTemplate*
|
SetControlThemeName(vl::presentation::theme::ThemeName::SystemFrameWindow);
|
||||||
{
|
|
||||||
return new SystemFrameWindowTemplate();
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}/* USER_CONTENT_END() */
|
}/* USER_CONTENT_END() */
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user