github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-23 06:25:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Switching from Difference between dates to Add or subtract dates ignores the first date field (#1210)

Browse source
This commit is contained in:
Quentin 2020-05-06 17:14:54 -05:00 • committed by GitHub
commit fd48f6ec1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Calculator/Views/DateCalculator.xaml.cpp
View file

@ -186,7 +186,27 @@ void DateCalculator::SetDefaultFocus()
void DateCalculator::DateCalcOption_Changed(_In_ Platform::Object ^ sender, _In_ Windows::UI::Xaml::Controls::SelectionChangedEventArgs ^ e) void DateCalculator::DateCalcOption_Changed(_In_ Platform::Object ^ sender, _In_ Windows::UI::Xaml::Controls::SelectionChangedEventArgs ^ e)
{ {
FindName("AddSubtractDateGrid"); FindName("AddSubtractDateGrid");
DateCalculationOption->SelectionChanged -= m_dateCalcOptionChangedEventToken; auto dateCalcViewModel = safe_cast<DateCalculatorViewModel ^>(this->DataContext);
// From Date Field needs to persist across Date Difference and Add Substract Date Mode.
// So when the mode dropdown changes, update the other datepicker with the latest date.
if (dateCalcViewModel->IsDateDiffMode)
{
if (AddSubtract_FromDate->Date == nullptr)
{
return;
}
DateDiff_FromDate->Date = AddSubtract_FromDate->Date->Value;
}
else
{
if (DateDiff_FromDate->Date == nullptr)
{
// If no date has been picked, then this can be null.
return;
}
AddSubtract_FromDate->Date = DateDiff_FromDate->Date->Value;
}
} }
void CalculatorApp::DateCalculator::AddSubtractDateGrid_Loaded(_In_ Platform::Object ^ sender, _In_ Windows::UI::Xaml::RoutedEventArgs ^ e) void CalculatorApp::DateCalculator::AddSubtractDateGrid_Loaded(_In_ Platform::Object ^ sender, _In_ Windows::UI::Xaml::RoutedEventArgs ^ e)