Merge master into feature/GraphingCalculator branch (#585)
* Merge master into feature/GraphingCalculator branch
This commit is contained in:
		| @@ -15,7 +15,7 @@ using namespace Windows::Foundation; | ||||
| using namespace Windows::UI::Xaml::Interop; | ||||
|  | ||||
| // returns automationName in form "Nth bit Value zero/one" depending if bit is set/unset at corresponding index of binary display | ||||
| Object^ BitFlipAutomationNameConverter::Convert(_In_ Object^ value, TypeName targetType, _In_ Object^ parameter, _In_ String^ language) | ||||
| Object ^ BitFlipAutomationNameConverter::Convert(_In_ Object ^ value, TypeName targetType, _In_ Object ^ parameter, _In_ String ^ language) | ||||
| { | ||||
|     auto resourceLoader = AppResourceProvider::GetInstance(); | ||||
|  | ||||
| @@ -26,15 +26,15 @@ Object^ BitFlipAutomationNameConverter::Convert(_In_ Object^ value, TypeName tar | ||||
|     wchar_t ch0 = localizationSettings.GetDigitSymbolFromEnUsDigit('0'); | ||||
|     wchar_t ch1 = localizationSettings.GetDigitSymbolFromEnUsDigit('1'); | ||||
|  | ||||
|     String^ indexName = resourceLoader.GetResourceString(static_cast<String^>(parameter)); | ||||
|     String^ bitName = resourceLoader.GetResourceString(L"BitAutomationName"); | ||||
|     String^ valueName = resourceLoader.GetResourceString(L"ValueAutomationName"); | ||||
|     String^ zero = resourceLoader.GetResourceString(L"BinaryZeroValueAutomationName"); | ||||
|     String^ one = resourceLoader.GetResourceString(L"BinaryOneValueAutomationName"); | ||||
|     String ^ indexName = resourceLoader.GetResourceString(static_cast<String ^>(parameter)); | ||||
|     String ^ bitName = resourceLoader.GetResourceString(L"BitAutomationName"); | ||||
|     String ^ valueName = resourceLoader.GetResourceString(L"ValueAutomationName"); | ||||
|     String ^ zero = resourceLoader.GetResourceString(L"BinaryZeroValueAutomationName"); | ||||
|     String ^ one = resourceLoader.GetResourceString(L"BinaryOneValueAutomationName"); | ||||
|     if ((value != nullptr) && (parameter != nullptr)) | ||||
|     { | ||||
|         wstring binaryDisplay = (static_cast<String^>(value))->Data(); | ||||
|         wstring indexString = (static_cast<String^>(parameter))->Data(); | ||||
|         wstring binaryDisplay = (static_cast<String ^>(value))->Data(); | ||||
|         wstring indexString = (static_cast<String ^>(parameter))->Data(); | ||||
|         wstringstream converter; | ||||
|         converter << indexString; | ||||
|         unsigned int index; | ||||
| @@ -42,7 +42,7 @@ Object^ BitFlipAutomationNameConverter::Convert(_In_ Object^ value, TypeName tar | ||||
|         unsigned int binaryLength = 0; | ||||
|  | ||||
|         // remove all the characters except 0 and 1 from the array. | ||||
|         for each (wchar_t bit in binaryDisplay) | ||||
|         for (wchar_t bit : binaryDisplay) | ||||
|         { | ||||
|             if ((bit == ch1) || (bit == ch0)) | ||||
|             { | ||||
| @@ -74,7 +74,7 @@ Object^ BitFlipAutomationNameConverter::Convert(_In_ Object^ value, TypeName tar | ||||
|     return (indexName + bitName + valueName + zero); | ||||
| } | ||||
|  | ||||
| Object^ BitFlipAutomationNameConverter::ConvertBack(_In_ Object^ value, TypeName targetType, _In_ Object^ parameter, _In_ String^ language) | ||||
| Object ^ BitFlipAutomationNameConverter::ConvertBack(_In_ Object ^ value, TypeName targetType, _In_ Object ^ parameter, _In_ String ^ language) | ||||
| { | ||||
|     return value; | ||||
| } | ||||
|   | ||||
| @@ -10,13 +10,21 @@ namespace CalculatorApp | ||||
|         /// <summary> | ||||
|         /// Value converter that translates binary value to automation name for a bit. | ||||
|         /// </summary> | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] | ||||
|         public ref class BitFlipAutomationNameConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] public ref class BitFlipAutomationNameConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         { | ||||
|         public: | ||||
|             virtual Platform::Object^ Convert(_In_ Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, _In_ Platform::Object^ parameter, _In_ Platform::String^ language); | ||||
|             virtual Platform::Object^ ConvertBack(_In_ Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, _In_ Platform::Object^ parameter, _In_ Platform::String^ language); | ||||
|  | ||||
|             virtual Platform::Object | ||||
|                 ^ Convert( | ||||
|                     _In_ Platform::Object ^ value, | ||||
|                     Windows::UI::Xaml::Interop::TypeName targetType, | ||||
|                     _In_ Platform::Object ^ parameter, | ||||
|                     _In_ Platform::String ^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ ConvertBack( | ||||
|                     _In_ Platform::Object ^ value, | ||||
|                     Windows::UI::Xaml::Interop::TypeName targetType, | ||||
|                     _In_ Platform::Object ^ parameter, | ||||
|                     _In_ Platform::String ^ language); | ||||
|         }; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -10,24 +10,24 @@ using namespace Platform; | ||||
| using namespace Windows::Foundation; | ||||
| using namespace Windows::UI::Xaml::Interop; | ||||
|  | ||||
| Object^ BooleanNegationConverter::Convert(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
| Object ^ BooleanNegationConverter::Convert(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
| { | ||||
|     (void) targetType;    // Unused parameter | ||||
|     (void) parameter;    // Unused parameter | ||||
|     (void) language;    // Unused parameter | ||||
|     (void)targetType; // Unused parameter | ||||
|     (void)parameter;  // Unused parameter | ||||
|     (void)language;   // Unused parameter | ||||
|  | ||||
|     auto boxedBool = dynamic_cast<Box<bool>^>(value); | ||||
|     auto boxedBool = dynamic_cast<Box<bool> ^>(value); | ||||
|     auto boolValue = (boxedBool != nullptr && boxedBool->Value); | ||||
|     return !boolValue; | ||||
| } | ||||
|  | ||||
| Object^ BooleanNegationConverter::ConvertBack(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
| Object ^ BooleanNegationConverter::ConvertBack(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
| { | ||||
|     (void) targetType;    // Unused parameter | ||||
|     (void) parameter;    // Unused parameter | ||||
|     (void) language;    // Unused parameter | ||||
|     (void)targetType; // Unused parameter | ||||
|     (void)parameter;  // Unused parameter | ||||
|     (void)language;   // Unused parameter | ||||
|  | ||||
|     auto boxedBool = dynamic_cast<Box<bool>^>(value); | ||||
|     auto boxedBool = dynamic_cast<Box<bool> ^>(value); | ||||
|     auto boolValue = (boxedBool != nullptr && boxedBool->Value); | ||||
|     return !boolValue; | ||||
| } | ||||
|   | ||||
| @@ -10,12 +10,17 @@ namespace CalculatorApp | ||||
|         /// <summary> | ||||
|         /// Value converter that translates true to false and vice versa. | ||||
|         /// </summary> | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] | ||||
|         public ref class BooleanNegationConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] public ref class BooleanNegationConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         { | ||||
|         public: | ||||
|             virtual Platform::Object^ Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object^ ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ Convert(Platform::Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object ^ parameter, Platform::String ^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ ConvertBack( | ||||
|                     Platform::Object ^ value, | ||||
|                     Windows::UI::Xaml::Interop::TypeName targetType, | ||||
|                     Platform::Object ^ parameter, | ||||
|                     Platform::String ^ language); | ||||
|         }; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -15,45 +15,45 @@ namespace CalculatorApp | ||||
| { | ||||
|     namespace Converters | ||||
|     { | ||||
|         Object^ BooleanToVisibilityConverter::Convert(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
|         Object ^ BooleanToVisibilityConverter::Convert(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
|         { | ||||
|             (void) targetType;    // Unused parameter | ||||
|             (void) parameter;    // Unused parameter | ||||
|             (void) language;    // Unused parameter | ||||
|             (void)targetType; // Unused parameter | ||||
|             (void)parameter;  // Unused parameter | ||||
|             (void)language;   // Unused parameter | ||||
|  | ||||
|             auto boxedBool = dynamic_cast<Box<bool>^>(value); | ||||
|             auto boxedBool = dynamic_cast<Box<bool> ^>(value); | ||||
|             auto boolValue = (boxedBool != nullptr && boxedBool->Value); | ||||
|             return BooleanToVisibilityConverter::Convert(boolValue); | ||||
|         } | ||||
|  | ||||
|         Object^ BooleanToVisibilityConverter::ConvertBack(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
|         Object ^ BooleanToVisibilityConverter::ConvertBack(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
|         { | ||||
|             (void) targetType;    // Unused parameter | ||||
|             (void) parameter;    // Unused parameter | ||||
|             (void) language;    // Unused parameter | ||||
|             (void)targetType; // Unused parameter | ||||
|             (void)parameter;  // Unused parameter | ||||
|             (void)language;   // Unused parameter | ||||
|  | ||||
|             auto visibility = dynamic_cast<Box<Visibility>^>(value); | ||||
|             auto visibility = dynamic_cast<Box<Visibility> ^>(value); | ||||
|             return (visibility != nullptr && visibility->Value == Visibility::Visible); | ||||
|         } | ||||
|  | ||||
|         Object^ BooleanToVisibilityNegationConverter::Convert(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
|         Object ^ BooleanToVisibilityNegationConverter::Convert(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
|         { | ||||
|             (void) targetType;    // Unused parameter | ||||
|             (void) parameter;    // Unused parameter | ||||
|             (void) language;    // Unused parameter | ||||
|             (void)targetType; // Unused parameter | ||||
|             (void)parameter;  // Unused parameter | ||||
|             (void)language;   // Unused parameter | ||||
|  | ||||
|             auto boxedBool = dynamic_cast<Box<bool>^>(value); | ||||
|             auto boxedBool = dynamic_cast<Box<bool> ^>(value); | ||||
|             auto boolValue = (boxedBool != nullptr && boxedBool->Value); | ||||
|             return BooleanToVisibilityConverter::Convert(!boolValue); | ||||
|         } | ||||
|  | ||||
|         Object^ BooleanToVisibilityNegationConverter::ConvertBack(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
|         Object ^ BooleanToVisibilityNegationConverter::ConvertBack(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
|         { | ||||
|             (void) targetType;    // Unused parameter | ||||
|             (void) parameter;    // Unused parameter | ||||
|             (void) language;    // Unused parameter | ||||
|             (void)targetType; // Unused parameter | ||||
|             (void)parameter;  // Unused parameter | ||||
|             (void)language;   // Unused parameter | ||||
|  | ||||
|             auto visibility = dynamic_cast<Box<Visibility>^>(value); | ||||
|             auto visibility = dynamic_cast<Box<Visibility> ^>(value); | ||||
|             return (visibility != nullptr && visibility->Value != Visibility::Visible); | ||||
|         } | ||||
|  | ||||
|   | ||||
| @@ -11,29 +11,41 @@ namespace CalculatorApp | ||||
|         /// Value converter that translates true to <see cref="Visibility::Visible"/> and false | ||||
|         /// to <see cref="Visibility::Collapsed"/>. | ||||
|         /// </summary> | ||||
|         public ref class BooleanToVisibilityConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|     public | ||||
|         ref class BooleanToVisibilityConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         { | ||||
|         public: | ||||
|             static constexpr Windows::UI::Xaml::Visibility Convert(bool visibility) | ||||
|             { | ||||
|                 return visibility | ||||
|                     ? Windows::UI::Xaml::Visibility::Visible | ||||
|                     : Windows::UI::Xaml::Visibility::Collapsed; | ||||
|                 return visibility ? Windows::UI::Xaml::Visibility::Visible : Windows::UI::Xaml::Visibility::Collapsed; | ||||
|             } | ||||
|  | ||||
|             virtual Platform::Object^ Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object^ ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ Convert(Platform::Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object ^ parameter, Platform::String ^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ ConvertBack( | ||||
|                     Platform::Object ^ value, | ||||
|                     Windows::UI::Xaml::Interop::TypeName targetType, | ||||
|                     Platform::Object ^ parameter, | ||||
|                     Platform::String ^ language); | ||||
|         }; | ||||
|  | ||||
|         /// <summary> | ||||
|         /// Value converter that translates false to <see cref="Visibility::Visible"/> and true | ||||
|         /// to <see cref="Visibility::Collapsed"/>. | ||||
|         /// </summary> | ||||
|         public ref class BooleanToVisibilityNegationConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|     public | ||||
|         ref class BooleanToVisibilityNegationConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         { | ||||
|         public: | ||||
|             virtual Platform::Object^ Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object^ ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ Convert(Platform::Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object ^ parameter, Platform::String ^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ ConvertBack( | ||||
|                     Platform::Object ^ value, | ||||
|                     Windows::UI::Xaml::Interop::TypeName targetType, | ||||
|                     Platform::Object ^ parameter, | ||||
|                     Platform::String ^ language); | ||||
|         }; | ||||
|  | ||||
|     } | ||||
|   | ||||
| @@ -1,44 +0,0 @@ | ||||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||||
| // Licensed under the MIT License. | ||||
|  | ||||
| #include "pch.h" | ||||
| #include "ExpressionItemContainerStyle.h" | ||||
| #include "CalcViewModel/Common/DisplayExpressionToken.h" | ||||
|  | ||||
| using namespace CalculatorApp::Common; | ||||
|  | ||||
| namespace CalculatorApp | ||||
| { | ||||
|     namespace Converters | ||||
|     { | ||||
|         Windows::UI::Xaml::Style^ ExpressionItemContainerStyle::SelectStyleCore(Platform::Object^ item, Windows::UI::Xaml::DependencyObject^ container) | ||||
|         { | ||||
|             DisplayExpressionToken^ token = dynamic_cast<DisplayExpressionToken^>(item); | ||||
|             if (token != nullptr) | ||||
|             { | ||||
|                 Common::TokenType type = token->Type; | ||||
|  | ||||
|                 switch (type) | ||||
|                 { | ||||
|                 case TokenType::Operator: | ||||
|                     if (token->IsTokenEditable) | ||||
|                     { | ||||
|                         return m_editableOperatorStyle; | ||||
|                     } | ||||
|                     else | ||||
|                     { | ||||
|                         return m_nonEditableOperatorStyle; | ||||
|                     } | ||||
|                 case TokenType::Operand: | ||||
|                     return m_operandStyle; | ||||
|                 case TokenType::Separator: | ||||
|                     return m_separatorStyle; | ||||
|                 default: | ||||
|                     throw ref new Platform::Exception(E_FAIL, L"Invalid token type"); | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             return m_separatorStyle; | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -1,71 +0,0 @@ | ||||
| // Copyright (c) Microsoft Corporation. All rights reserved. | ||||
| // Licensed under the MIT License. | ||||
|  | ||||
| #pragma once | ||||
|  | ||||
| namespace CalculatorApp | ||||
| { | ||||
|     namespace Converters | ||||
|     { | ||||
|         [Windows::UI::Xaml::Data::Bindable] | ||||
|         public ref class ExpressionItemContainerStyle sealed : public Windows::UI::Xaml::Controls::StyleSelector | ||||
|         { | ||||
|         public: | ||||
|             virtual Windows::UI::Xaml::Style^ SelectStyleCore(Platform::Object^ item, Windows::UI::Xaml::DependencyObject^ container) override; | ||||
|  | ||||
|             property Windows::UI::Xaml::Style^ EditableOperatorStyle | ||||
|             { | ||||
|                 Windows::UI::Xaml::Style^ get() | ||||
|                 { | ||||
|                     return m_editableOperatorStyle; | ||||
|                 } | ||||
|                 void set(Windows::UI::Xaml::Style^ val) | ||||
|                 { | ||||
|                     m_editableOperatorStyle = val; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             property Windows::UI::Xaml::Style^ OperandStyle | ||||
|             { | ||||
|                 Windows::UI::Xaml::Style^ get() | ||||
|                 { | ||||
|                     return m_operandStyle; | ||||
|                 } | ||||
|                 void set(Windows::UI::Xaml::Style^ val) | ||||
|                 { | ||||
|                     m_operandStyle = val; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             property Windows::UI::Xaml::Style^ SeparatorStyle | ||||
|             { | ||||
|                 Windows::UI::Xaml::Style^ get() | ||||
|                 { | ||||
|                     return m_separatorStyle; | ||||
|                 } | ||||
|                 void set(Windows::UI::Xaml::Style^ val) | ||||
|                 { | ||||
|                     m_separatorStyle = val; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             property Windows::UI::Xaml::Style^ NonEditableOperatorStyle | ||||
|             { | ||||
|                 Windows::UI::Xaml::Style^ get() | ||||
|                 { | ||||
|                     return m_nonEditableOperatorStyle; | ||||
|                 } | ||||
|                 void set(Windows::UI::Xaml::Style^ val) | ||||
|                 { | ||||
|                     m_nonEditableOperatorStyle = val; | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|         private: | ||||
|             Windows::UI::Xaml::Style^ m_editableOperatorStyle; | ||||
|             Windows::UI::Xaml::Style^ m_nonEditableOperatorStyle; | ||||
|             Windows::UI::Xaml::Style^ m_operandStyle; | ||||
|             Windows::UI::Xaml::Style^ m_separatorStyle; | ||||
|         }; | ||||
|     } | ||||
| } | ||||
| @@ -11,9 +11,10 @@ namespace CalculatorApp | ||||
| { | ||||
|     namespace Converters | ||||
|     { | ||||
|         Windows::UI::Xaml::DataTemplate^ ExpressionItemTemplateSelector::SelectTemplateCore(Platform::Object^ item, Windows::UI::Xaml::DependencyObject^ container) | ||||
|         Windows::UI::Xaml::DataTemplate | ||||
|             ^ ExpressionItemTemplateSelector::SelectTemplateCore(Platform::Object ^ item, Windows::UI::Xaml::DependencyObject ^ container) | ||||
|         { | ||||
|             DisplayExpressionToken^ token = dynamic_cast<DisplayExpressionToken^>(item); | ||||
|             DisplayExpressionToken ^ token = dynamic_cast<DisplayExpressionToken ^>(item); | ||||
|             if (token != nullptr) | ||||
|             { | ||||
|                 Common::TokenType type = token->Type; | ||||
|   | ||||
| @@ -7,11 +7,10 @@ namespace CalculatorApp | ||||
| { | ||||
|     namespace Converters | ||||
|     { | ||||
|         [Windows::UI::Xaml::Data::Bindable] | ||||
|         public ref class ExpressionItemTemplateSelector sealed : public Windows::UI::Xaml::Controls::DataTemplateSelector | ||||
|         [Windows::UI::Xaml::Data::Bindable] public ref class ExpressionItemTemplateSelector sealed : public Windows::UI::Xaml::Controls::DataTemplateSelector | ||||
|         { | ||||
|         public: | ||||
|             virtual Windows::UI::Xaml::DataTemplate^ SelectTemplateCore(Platform::Object^ item, Windows::UI::Xaml::DependencyObject^ container) override; | ||||
|             virtual Windows::UI::Xaml::DataTemplate ^ SelectTemplateCore(Platform::Object ^ item, Windows::UI::Xaml::DependencyObject ^ container) override; | ||||
|  | ||||
|             property Windows::UI::Xaml::DataTemplate^ OperatorTemplate | ||||
|             { | ||||
| @@ -51,8 +50,8 @@ namespace CalculatorApp | ||||
|  | ||||
|         private: | ||||
|             Windows::UI::Xaml::DataTemplate^ m_operatorTemplate; | ||||
|             Windows::UI::Xaml::DataTemplate^ m_operandTemplate; | ||||
|             Windows::UI::Xaml::DataTemplate^ m_separatorTemplate; | ||||
|             Windows::UI::Xaml::DataTemplate ^ m_operandTemplate; | ||||
|             Windows::UI::Xaml::DataTemplate ^ m_separatorTemplate; | ||||
|         }; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -11,34 +11,34 @@ using namespace Windows::Foundation; | ||||
| using namespace Windows::UI::Xaml; | ||||
| using namespace Windows::UI::Xaml::Interop; | ||||
|  | ||||
| Object^ ItemSizeToVisibilityConverter::Convert(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
| Object ^ ItemSizeToVisibilityConverter::Convert(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
| { | ||||
|     (void) targetType;    // Unused parameter | ||||
|     (void) parameter;    // Unused parameter | ||||
|     (void) language;    // Unused parameter | ||||
|     (void)targetType; // Unused parameter | ||||
|     (void)parameter;  // Unused parameter | ||||
|     (void)language;   // Unused parameter | ||||
|  | ||||
|     auto items = dynamic_cast<Box<int>^>(value); | ||||
|     auto items = dynamic_cast<Box<int> ^>(value); | ||||
|     auto boolValue = (items != nullptr && (items->Value == 0)); | ||||
|     return BooleanToVisibilityConverter::Convert(boolValue); | ||||
| } | ||||
|  | ||||
| Object^ ItemSizeToVisibilityConverter::ConvertBack(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
| Object ^ ItemSizeToVisibilityConverter::ConvertBack(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
| { | ||||
|     throw ref new NotImplementedException(); | ||||
| } | ||||
|  | ||||
| Object^ ItemSizeToVisibilityNegationConverter::Convert(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
| Object ^ ItemSizeToVisibilityNegationConverter::Convert(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
| { | ||||
|     (void) targetType;    // Unused parameter | ||||
|     (void) parameter;    // Unused parameter | ||||
|     (void) language;    // Unused parameter | ||||
|     (void)targetType; // Unused parameter | ||||
|     (void)parameter;  // Unused parameter | ||||
|     (void)language;   // Unused parameter | ||||
|  | ||||
|     auto items = dynamic_cast<Box<int>^>(value); | ||||
|     auto items = dynamic_cast<Box<int> ^>(value); | ||||
|     auto boolValue = (items != nullptr && (items->Value > 0)); | ||||
|     return BooleanToVisibilityConverter::Convert(boolValue); | ||||
| } | ||||
|  | ||||
| Object^ ItemSizeToVisibilityNegationConverter::ConvertBack(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
| Object ^ ItemSizeToVisibilityNegationConverter::ConvertBack(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
| { | ||||
|     throw ref new NotImplementedException(); | ||||
| } | ||||
|   | ||||
| @@ -7,19 +7,31 @@ namespace CalculatorApp | ||||
| { | ||||
|     namespace Converters | ||||
|     { | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] | ||||
|         public ref class ItemSizeToVisibilityConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] public ref class ItemSizeToVisibilityConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         { | ||||
|         public: | ||||
|             virtual Platform::Object^ Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object^ ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ Convert(Platform::Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object ^ parameter, Platform::String ^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ ConvertBack( | ||||
|                     Platform::Object ^ value, | ||||
|                     Windows::UI::Xaml::Interop::TypeName targetType, | ||||
|                     Platform::Object ^ parameter, | ||||
|                     Platform::String ^ language); | ||||
|         }; | ||||
|  | ||||
|         public ref class ItemSizeToVisibilityNegationConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|     public | ||||
|         ref class ItemSizeToVisibilityNegationConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         { | ||||
|         public: | ||||
|             virtual Platform::Object^ Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object^ ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ Convert(Platform::Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object ^ parameter, Platform::String ^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ ConvertBack( | ||||
|                     Platform::Object ^ value, | ||||
|                     Windows::UI::Xaml::Interop::TypeName targetType, | ||||
|                     Platform::Object ^ parameter, | ||||
|                     Platform::String ^ language); | ||||
|         }; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -15,14 +15,14 @@ namespace CalculatorApp | ||||
| { | ||||
|     namespace Converters | ||||
|     { | ||||
|         Object^ RadixToStringConverter::Convert(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
|         Object ^ RadixToStringConverter::Convert(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
|         { | ||||
|             (void)targetType;    // Unused parameter | ||||
|             (void)parameter;    // Unused parameter | ||||
|             (void)language;    // Unused parameter | ||||
|             (void)targetType; // Unused parameter | ||||
|             (void)parameter;  // Unused parameter | ||||
|             (void)language;   // Unused parameter | ||||
|  | ||||
|             auto boxedInt = dynamic_cast<Box<int>^>(value); | ||||
|             Platform::String^ convertedValue; | ||||
|             auto boxedInt = dynamic_cast<Box<int> ^>(value); | ||||
|             Platform::String ^ convertedValue; | ||||
|             auto resourceLoader = AppResourceProvider::GetInstance(); | ||||
|             switch (boxedInt->Value) | ||||
|             { | ||||
| @@ -48,14 +48,11 @@ namespace CalculatorApp | ||||
|             } | ||||
|             default: | ||||
|                 break; | ||||
|  | ||||
|             }; | ||||
|             return convertedValue; | ||||
|  | ||||
|  | ||||
|         } | ||||
|  | ||||
|         Object^ RadixToStringConverter::ConvertBack(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
|         Object ^ RadixToStringConverter::ConvertBack(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
|         { | ||||
|             throw ref new NotImplementedException(); | ||||
|         } | ||||
|   | ||||
| @@ -10,12 +10,17 @@ namespace CalculatorApp | ||||
|         /// <summary> | ||||
|         /// Value converter that translates true to false and vice versa. | ||||
|         /// </summary> | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] | ||||
|         public ref class RadixToStringConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] public ref class RadixToStringConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         { | ||||
|         public: | ||||
|             virtual Platform::Object^ Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object^ ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ Convert(Platform::Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object ^ parameter, Platform::String ^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ ConvertBack( | ||||
|                     Platform::Object ^ value, | ||||
|                     Windows::UI::Xaml::Interop::TypeName targetType, | ||||
|                     Platform::Object ^ parameter, | ||||
|                     Platform::String ^ language); | ||||
|         }; | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -13,9 +13,9 @@ namespace CalculatorApp | ||||
| { | ||||
|     namespace Common | ||||
|     { | ||||
|         Object^ VisibilityNegationConverter::Convert(Object^ value, TypeName /*targetType*/, Object^ /*parameter*/, String^ /*language*/) | ||||
|         Object ^ VisibilityNegationConverter::Convert(Object ^ value, TypeName /*targetType*/, Object ^ /*parameter*/, String ^ /*language*/) | ||||
|         { | ||||
|             auto boxedVisibility = dynamic_cast<Box<Visibility>^>(value); | ||||
|             auto boxedVisibility = dynamic_cast<Box<Visibility> ^>(value); | ||||
|             Visibility visibility = Visibility::Collapsed; | ||||
|             if (boxedVisibility != nullptr && boxedVisibility->Value == Visibility::Collapsed) | ||||
|             { | ||||
| @@ -24,7 +24,7 @@ namespace CalculatorApp | ||||
|             return visibility; | ||||
|         } | ||||
|  | ||||
|         Object^ VisibilityNegationConverter::ConvertBack(Object^ value, TypeName targetType, Object^ parameter, String^ language) | ||||
|         Object ^ VisibilityNegationConverter::ConvertBack(Object ^ value, TypeName targetType, Object ^ parameter, String ^ language) | ||||
|         { | ||||
|             return Convert(value, targetType, parameter, language); | ||||
|         } | ||||
|   | ||||
| @@ -10,12 +10,17 @@ namespace CalculatorApp | ||||
|         /// <summary> | ||||
|         /// Value converter that translates Visible to Collapsed and vice versa | ||||
|         /// </summary> | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] | ||||
|         public ref class VisibilityNegationConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         [Windows::Foundation::Metadata::WebHostHidden] public ref class VisibilityNegationConverter sealed : Windows::UI::Xaml::Data::IValueConverter | ||||
|         { | ||||
|         public: | ||||
|             virtual Platform::Object^ Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object^ ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ Convert(Platform::Object ^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object ^ parameter, Platform::String ^ language); | ||||
|             virtual Platform::Object | ||||
|                 ^ ConvertBack( | ||||
|                     Platform::Object ^ value, | ||||
|                     Windows::UI::Xaml::Interop::TypeName targetType, | ||||
|                     Platform::Object ^ parameter, | ||||
|                     Platform::String ^ language); | ||||
|         }; | ||||
|     } | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user