Update release

This commit is contained in:
vczh
2016-01-06 02:48:21 -08:00
parent 181820fa50
commit 9fab9d9d6a
2 changed files with 23 additions and 3 deletions
+19 -1
View File
@@ -1535,6 +1535,13 @@ GuiDialogBase
return dynamic_cast<GuiWindow*>(host); return dynamic_cast<GuiWindow*>(host);
} }
} }
else if (auto composition = dynamic_cast<GuiGraphicsComposition*>(rootObject))
{
if (auto host = composition->GetRelatedControlHost())
{
return dynamic_cast<GuiWindow*>(host);
}
}
} }
return nullptr; return nullptr;
} }
@@ -4409,7 +4416,6 @@ GuiPopup
INativeWindow* window=GetNativeWindow(); INativeWindow* window=GetNativeWindow();
if(window) if(window)
{ {
Size size=window->GetBounds().GetSize();
Rect bounds(Point(0, 0), control->GetBoundsComposition()->GetBounds().GetSize()); Rect bounds(Point(0, 0), control->GetBoundsComposition()->GetBounds().GetSize());
ShowPopup(control, bounds, preferredTopBottomSide); ShowPopup(control, bounds, preferredTopBottomSide);
} }
@@ -33666,6 +33672,12 @@ GuiFlowComposition
needUpdate = true; needUpdate = true;
} }
void GuiFlowComposition::ForceCalculateSizeImmediately()
{
GuiBoundsComposition::ForceCalculateSizeImmediately();
UpdateFlowItemBounds(true);
}
Size GuiFlowComposition::GetMinPreferredClientSize() Size GuiFlowComposition::GetMinPreferredClientSize()
{ {
Size minSize = GuiBoundsComposition::GetMinPreferredClientSize(); Size minSize = GuiBoundsComposition::GetMinPreferredClientSize();
@@ -34180,6 +34192,12 @@ GuiStackComposition
EnsureStackItemVisible(); EnsureStackItemVisible();
} }
void GuiStackComposition::ForceCalculateSizeImmediately()
{
GuiBoundsComposition::ForceCalculateSizeImmediately();
UpdateStackItemBounds();
}
Size GuiStackComposition::GetMinPreferredClientSize() Size GuiStackComposition::GetMinPreferredClientSize()
{ {
Size minSize = GuiBoundsComposition::GetMinPreferredClientSize(); Size minSize = GuiBoundsComposition::GetMinPreferredClientSize();
+2
View File
@@ -6887,6 +6887,7 @@ Stack Compositions
/// <param name="value">The stack item padding.</param> /// <param name="value">The stack item padding.</param>
void SetPadding(vint value); void SetPadding(vint value);
void ForceCalculateSizeImmediately()override;
Size GetMinPreferredClientSize()override; Size GetMinPreferredClientSize()override;
Rect GetBounds()override; Rect GetBounds()override;
@@ -7201,6 +7202,7 @@ Flow Compositions
/// <param name="value">The alignment.</param> /// <param name="value">The alignment.</param>
void SetAlignment(FlowAlignment value); void SetAlignment(FlowAlignment value);
void ForceCalculateSizeImmediately()override;
Size GetMinPreferredClientSize()override; Size GetMinPreferredClientSize()override;
Rect GetBounds()override; Rect GetBounds()override;
}; };