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

replace max by std::max

Browse source
This commit is contained in:
Rudy Huyn 2019-03-25 22:52:38 -07:00
commit dab5a61ea5
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Calculator/Views/UnitConverter.xaml.cpp
View file

@ -14,6 +14,7 @@
#include "CalcViewModel/Common/LocalizationService.h"
#include "CalcViewModel/Common/LocalizationSettings.h"
using namespace std;
using namespace CalculatorApp;
using namespace CalculatorApp::Common;
using namespace CalculatorApp::Controls;
@ -381,5 +382,5 @@ void UnitConverter::HideProgressRing()
void CalculatorApp::UnitConverter::SupplementaryResultsPanelInGrid_SizeChanged(Platform::Object^ sender, Windows::UI::Xaml::SizeChangedEventArgs^ e)
{
//We add 0.01 to be sure to not create an infinite loop with SizeChanged events cascading due to float approximation
RowDltrUnits->MinHeight = max(48, e->NewSize.Height + 0.01);
RowDltrUnits->MinHeight = max(48.0, e->NewSize.Height + 0.01);
}