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

Revert NarratorAnnouncement.h changes and removed unused code from DataCalculator.xaml.h. Updated comments in RaiseNotification method in DateCalculator.xaml.cpp

Browse source
This commit is contained in:
Stephanie Anderl 2019-03-04 16:10:33 -08:00
commit bfa81810df
3 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/CalcViewModel/Common/Automation/NarratorAnnouncement.h
View file

@ -57,7 +57,7 @@ namespace CalculatorApp::Common::Automation
private: private:
// Make CalculatorAnnouncement a friend class so it is the only // Make CalculatorAnnouncement a friend class so it is the only
// class that can access the private constructor. // class that can access the private constructor.
friend ref class CalculatorAnnouncement; friend class CalculatorAnnouncement;
NarratorAnnouncement( NarratorAnnouncement(
Platform::String^ announcement, Platform::String^ announcement,
@ -73,7 +73,7 @@ namespace CalculatorApp::Common::Automation
// CalculatorAnnouncement is intended to contain only static methods // CalculatorAnnouncement is intended to contain only static methods
// that return announcements made for the Calculator app. // that return announcements made for the Calculator app.
public ref class CalculatorAnnouncement sealed class CalculatorAnnouncement
{ {
public: public:
static NarratorAnnouncement^ GetDisplayUpdatedAnnouncement(Platform::String^ announcement); static NarratorAnnouncement^ GetDisplayUpdatedAnnouncement(Platform::String^ announcement);
@ -88,11 +88,7 @@ namespace CalculatorApp::Common::Automation
static NarratorAnnouncement^ GetCategoryNameChangedAnnouncement(Platform::String^ announcement); static NarratorAnnouncement^ GetCategoryNameChangedAnnouncement(Platform::String^ announcement);
static NarratorAnnouncement^ GetUpdateCurrencyRatesAnnouncement(Platform::String^ announcement); static NarratorAnnouncement^ GetUpdateCurrencyRatesAnnouncement(Platform::String^ announcement);
static NarratorAnnouncement^ GetDisplayCopiedAnnouncement(Platform::String^ announcement); static NarratorAnnouncement^ GetDisplayCopiedAnnouncement(Platform::String^ announcement);
private:
CalculatorAnnouncement() { }
}; };
} }

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

@ -209,7 +209,7 @@ void DateCalculator::ReselectCalendarDate(_In_ Windows::UI::Xaml::Controls::Cale
void DateCalculator::OffsetDropDownClosed(_In_ Object^ sender, _In_ Object^ e) void DateCalculator::OffsetDropDownClosed(_In_ Object^ sender, _In_ Object^ e)
{ {
RaiseLiveRegionChangedAutomationEvent(false); RaiseLiveRegionChangedAutomationEvent(/* DateDiff mode */ false);
} }
void DateCalculator::CalendarFlyoutClosed(_In_ Object^ sender, _In_ Object^ e) void DateCalculator::CalendarFlyoutClosed(_In_ Object^ sender, _In_ Object^ e)
@ -227,5 +227,5 @@ void DateCalculator::RaiseLiveRegionChangedAutomationEvent(_In_ bool isDateDiffM
void CalculatorApp::DateCalculator::AddSubtractOption_Checked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) void CalculatorApp::DateCalculator::AddSubtractOption_Checked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
{ {
RaiseLiveRegionChangedAutomationEvent(false); RaiseLiveRegionChangedAutomationEvent(/* DateDiff mode */ false);
} }

1
src/Calculator/Views/DateCalculator.xaml.h
View file

@ -45,6 +45,5 @@ namespace CalculatorApp
void RaiseLiveRegionChangedAutomationEvent(_In_ bool isDateDiffMode); void RaiseLiveRegionChangedAutomationEvent(_In_ bool isDateDiffMode);
Windows::Foundation::EventRegistrationToken m_dateCalcOptionChangedEventToken; Windows::Foundation::EventRegistrationToken m_dateCalcOptionChangedEventToken;
void AddOption_Checked(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
}; };
} }