github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

format conditionals

Browse source
This commit is contained in:
Rudy Huyn 2019-03-20 14:06:12 -07:00
commit c213768121
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Calculator/Controls/HorizontalNoOverflowStackPanel.cpp
View file

@ -42,7 +42,9 @@ Size HorizontalNoOverflowStackPanel::ArrangeOverride(Size finalSize)
auto lastChild = Children->GetAt(Children->Size - 1); auto lastChild = Children->GetAt(Children->Size - 1);
float lastChildWidth = 0; float lastChildWidth = 0;
if (Children->Size > 2 && ShouldPrioritizeLastItem()) if (Children->Size > 2 && ShouldPrioritizeLastItem())
{
lastChildWidth = lastChild->DesiredSize.Width; lastChildWidth = lastChild->DesiredSize.Width;
}
for (auto item : Children) for (auto item : Children)
{ {
auto widthAvailable = finalSize.Width - posX; auto widthAvailable = finalSize.Width - posX;

8
src/Calculator/Views/SupplementaryResults.xaml.cpp
View file

@ -72,12 +72,14 @@ SupplementaryResults::SupplementaryResults()
bool SupplementaryResultNoOverflowStackPanel::ShouldPrioritizeLastItem() bool SupplementaryResultNoOverflowStackPanel::ShouldPrioritizeLastItem()
{ {
if (Children->Size == 0) if (Children->Size == 0)
{
return false; return false;
}
auto lastChild = dynamic_cast<FrameworkElement^>(Children->GetAt(Children->Size - 1)); auto lastChild = dynamic_cast<FrameworkElement^>(Children->GetAt(Children->Size - 1));
if (lastChild == nullptr) if (lastChild == nullptr)
{
return false; return false;
}
auto suppResult = dynamic_cast<SupplementaryResult^>(lastChild->DataContext); auto suppResult = dynamic_cast<SupplementaryResult^>(lastChild->DataContext);
if (suppResult == nullptr) return suppResult == nullptr? false: suppResult->IsWhimsical();
return false;
return suppResult->IsWhimsical();
} }