DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into feature/GraphingCalculator branch (#585)

Browse Source 
* Merge master into feature/GraphingCalculator branch
This commit is contained in:
Stephanie Anderl
2019-07-15 11:17:21 -07:00
committed by GitHub
parent 1475b49120
commit a418777f02
447 changed files with 18056 additions and 19323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Calculator/Views/StateTriggers/AspectRatioTrigger.cpp
View File

@@ -24,26 +24,28 @@ AspectRatioTrigger::~AspectRatioTrigger()
UnregisterSizeChanged(Source);
}
void AspectRatioTrigger::OnSourcePropertyChanged(FrameworkElement^ oldValue, FrameworkElement^ newValue)
void AspectRatioTrigger::OnSourcePropertyChanged(FrameworkElement ^ oldValue, FrameworkElement ^ newValue)
{
UnregisterSizeChanged(oldValue);
RegisterSizeChanged(newValue);
}
void AspectRatioTrigger::RegisterSizeChanged(FrameworkElement^ element)
void AspectRatioTrigger::RegisterSizeChanged(FrameworkElement ^ element)
{
if (element == nullptr) { return; }
if (element == nullptr)
{
return;
}
if (element != Source)
{
UnregisterSizeChanged(Source);
}
m_sizeChangedToken =
element->SizeChanged += ref new SizeChangedEventHandler(this, &AspectRatioTrigger::OnSizeChanged);
m_sizeChangedToken = element->SizeChanged += ref new SizeChangedEventHandler(this, &AspectRatioTrigger::OnSizeChanged);
}
void AspectRatioTrigger::UnregisterSizeChanged(FrameworkElement^ element)
void AspectRatioTrigger::UnregisterSizeChanged(FrameworkElement ^ element)
{
if ((element != nullptr) && (m_sizeChangedToken.Value != 0))
{
@@ -52,7 +54,7 @@ void AspectRatioTrigger::UnregisterSizeChanged(FrameworkElement^ element)
}
}
void AspectRatioTrigger::OnSizeChanged(Object^ sender, SizeChangedEventArgs^ e)
void AspectRatioTrigger::OnSizeChanged(Object ^ sender, SizeChangedEventArgs ^ e)
{
UpdateIsActive(e->NewSize);
}

16
src/Calculator/Views/StateTriggers/AspectRatioTrigger.h
View File

@@ -13,13 +13,15 @@
namespace CalculatorApp::Views::StateTriggers
{
public enum class Aspect
public
enum class Aspect
{
Height,
Width
};
public ref class AspectRatioTrigger sealed : public Windows::UI::Xaml::StateTriggerBase
public
ref class AspectRatioTrigger sealed : public Windows::UI::Xaml::StateTriggerBase
{
public:
AspectRatioTrigger();
@@ -27,7 +29,7 @@ namespace CalculatorApp::Views::StateTriggers
DEPENDENCY_PROPERTY_OWNER(AspectRatioTrigger);
/* The source for which this class will respond to size changed events. */
DEPENDENCY_PROPERTY_WITH_CALLBACK(Windows::UI::Xaml::FrameworkElement^, Source);
DEPENDENCY_PROPERTY_WITH_CALLBACK(Windows::UI::Xaml::FrameworkElement ^, Source);
/* Either Height or Width. The property will determine which aspect is used as the numerator when calculating
the aspect ratio. */
@@ -42,11 +44,11 @@ namespace CalculatorApp::Views::StateTriggers
private:
~AspectRatioTrigger();
void OnSourcePropertyChanged(Windows::UI::Xaml::FrameworkElement^ oldValue, Windows::UI::Xaml::FrameworkElement^ newValue);
void OnSourcePropertyChanged(Windows::UI::Xaml::FrameworkElement ^ oldValue, Windows::UI::Xaml::FrameworkElement ^ newValue);
void RegisterSizeChanged(Windows::UI::Xaml::FrameworkElement^ element);
void UnregisterSizeChanged(Windows::UI::Xaml::FrameworkElement^ element);
void OnSizeChanged(Platform::Object^ sender, Windows::UI::Xaml::SizeChangedEventArgs^ e);
void RegisterSizeChanged(Windows::UI::Xaml::FrameworkElement ^ element);
void UnregisterSizeChanged(Windows::UI::Xaml::FrameworkElement ^ element);
void OnSizeChanged(Platform::Object ^ sender, Windows::UI::Xaml::SizeChangedEventArgs ^ e);
void UpdateIsActive(Windows::Foundation::Size sourceSize);