mirror of
https://github.com/vczh-libraries/Release.git
synced 2026-08-17 17:31:44 +08:00
Update release
This commit is contained in:
+34
-18
@@ -345,9 +345,7 @@ GuiApplication
|
||||
|
||||
void GuiApplication::RegisterPopupClosed(GuiPopup* popup)
|
||||
{
|
||||
if(openingPopups.Remove(popup))
|
||||
{
|
||||
}
|
||||
openingPopups.Remove(popup);
|
||||
}
|
||||
|
||||
void GuiApplication::TooltipMouseEnter(compositions::GuiGraphicsComposition* sender, compositions::GuiEventArgs& arguments)
|
||||
@@ -623,18 +621,18 @@ GuiApplicationMain
|
||||
}
|
||||
|
||||
GetCurrentController()->InputService()->StartTimer();
|
||||
IAsyncScheduler::RegisterSchedulerForCurrentThread(Ptr(new UIThreadAsyncScheduler));
|
||||
IAsyncScheduler::RegisterDefaultScheduler(Ptr(new OtherThreadAsyncScheduler));
|
||||
GuiInitializeUtilities();
|
||||
{
|
||||
GuiApplication app;
|
||||
application = &app;
|
||||
IAsyncScheduler::RegisterSchedulerForCurrentThread(Ptr(new UIThreadAsyncScheduler));
|
||||
IAsyncScheduler::RegisterDefaultScheduler(Ptr(new OtherThreadAsyncScheduler));
|
||||
GuiInitializeUtilities();
|
||||
GuiMain();
|
||||
GuiFinalizeUtilities();
|
||||
IAsyncScheduler::UnregisterDefaultScheduler();
|
||||
IAsyncScheduler::UnregisterSchedulerForCurrentThread();
|
||||
application = nullptr;
|
||||
}
|
||||
application = nullptr;
|
||||
GuiFinalizeUtilities();
|
||||
IAsyncScheduler::UnregisterDefaultScheduler();
|
||||
IAsyncScheduler::UnregisterSchedulerForCurrentThread();
|
||||
GetCurrentController()->InputService()->StopTimer();
|
||||
theme::FinalizeTheme();
|
||||
FinalizeGlobalStorage();
|
||||
@@ -673,13 +671,11 @@ GuiApplicationMain
|
||||
}
|
||||
|
||||
GetCurrentController()->InputService()->StartTimer();
|
||||
{
|
||||
IAsyncScheduler::RegisterSchedulerForCurrentThread(Ptr(new UIThreadAsyncScheduler));
|
||||
IAsyncScheduler::RegisterDefaultScheduler(Ptr(new OtherThreadAsyncScheduler));
|
||||
GuiMain();
|
||||
IAsyncScheduler::UnregisterDefaultScheduler();
|
||||
IAsyncScheduler::UnregisterSchedulerForCurrentThread();
|
||||
}
|
||||
IAsyncScheduler::RegisterSchedulerForCurrentThread(Ptr(new UIThreadAsyncScheduler));
|
||||
IAsyncScheduler::RegisterDefaultScheduler(Ptr(new OtherThreadAsyncScheduler));
|
||||
GuiMain();
|
||||
IAsyncScheduler::UnregisterDefaultScheduler();
|
||||
IAsyncScheduler::UnregisterSchedulerForCurrentThread();
|
||||
GetCurrentController()->InputService()->StopTimer();
|
||||
FinalizeGlobalStorage();
|
||||
|
||||
@@ -825,6 +821,18 @@ GuiControl
|
||||
}
|
||||
}
|
||||
|
||||
void GuiControl::FixingMissingControlTemplateCallback(templates::GuiControlTemplate* value)
|
||||
{
|
||||
}
|
||||
|
||||
void GuiControl::CallFixingMissingControlTemplateCallback()
|
||||
{
|
||||
if (controlTemplateObject)
|
||||
{
|
||||
FixingMissingControlTemplateCallback(controlTemplateObject);
|
||||
}
|
||||
}
|
||||
|
||||
void GuiControl::OnChildInserted(GuiControl* control)
|
||||
{
|
||||
GuiControl* oldParent=control->parent;
|
||||
@@ -2789,6 +2797,9 @@ GuiWindow
|
||||
|
||||
void GuiWindow::Opened()
|
||||
{
|
||||
// Workaround:
|
||||
// Constructor calling SetNativeWindow skips AfterControlTemplateInstalled_ of all sub classes
|
||||
CallFixingMissingControlTemplateCallback();
|
||||
GuiControlHost::Opened();
|
||||
if (auto ct = TypedControlTemplateObject(false))
|
||||
{
|
||||
@@ -6878,7 +6889,7 @@ GuiScrollView
|
||||
{
|
||||
vint position = scroll->GetPosition();
|
||||
vint move = scroll->GetSmallMove();
|
||||
position -= move * arguments.wheel / 60;
|
||||
position = move * arguments.wheel / 60;
|
||||
scroll->SetPosition(position);
|
||||
}
|
||||
}
|
||||
@@ -25834,6 +25845,11 @@ GuiBindableRibbonGalleryList
|
||||
}
|
||||
}
|
||||
|
||||
GuiSelectableListControl* GuiBindableRibbonGalleryList::GetListControlInDropdown()
|
||||
{
|
||||
return itemList;
|
||||
}
|
||||
|
||||
GuiToolstripMenu* GuiBindableRibbonGalleryList::GetSubMenu()
|
||||
{
|
||||
return subMenu;
|
||||
|
||||
Reference in New Issue
Block a user