Added support for small windows in the graphing calculator (#803)
* Add support of small windows * remove extra space * Modify how we manage the tooltip * Fix merge issues
This commit is contained in:
		| @@ -13,16 +13,18 @@ namespace CalculatorApp | ||||
|     constexpr double zoomInScale = 1 / 1.0625; | ||||
|     constexpr double zoomOutScale = 1.0625; | ||||
|  | ||||
|     public ref class GraphingCalculator sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged | ||||
| public ref class GraphingCalculator sealed : public Windows::UI::Xaml::Data::INotifyPropertyChanged | ||||
|     { | ||||
|     public: | ||||
|         GraphingCalculator(); | ||||
|  | ||||
|         OBSERVABLE_OBJECT(); | ||||
|         DEPENDENCY_PROPERTY_OWNER(GraphingCalculator); | ||||
|         COMMAND_FOR_METHOD(ZoomOutButtonPressed, GraphingCalculator::OnZoomOutCommand); | ||||
|         COMMAND_FOR_METHOD(ZoomInButtonPressed, GraphingCalculator::OnZoomInCommand); | ||||
|         COMMAND_FOR_METHOD(ZoomResetButtonPressed, GraphingCalculator::OnZoomResetCommand); | ||||
|         OBSERVABLE_PROPERTY_RW(bool, IsKeyGraphFeaturesVisible); | ||||
|         DEPENDENCY_PROPERTY(bool, IsSmallState); | ||||
|  | ||||
|         property CalculatorApp::ViewModel::GraphingCalculatorViewModel^ ViewModel | ||||
|         { | ||||
| @@ -30,39 +32,43 @@ namespace CalculatorApp | ||||
|             void set(CalculatorApp::ViewModel::GraphingCalculatorViewModel^ vm); | ||||
|         } | ||||
|  | ||||
|         Windows::UI::Xaml::Visibility ShouldDisplayPanel(bool isSmallState, bool isEquationModeActivated, bool isGraphPanel); | ||||
|         Platform::String ^ GetInfoForSwitchModeToggleButton(bool isChecked); | ||||
|     private: | ||||
|         void GraphingCalculator_DataContextChanged(Windows::UI::Xaml::FrameworkElement^ sender, Windows::UI::Xaml::DataContextChangedEventArgs^ args); | ||||
|         void GraphingCalculator_DataContextChanged(Windows::UI::Xaml::FrameworkElement ^ sender, Windows::UI::Xaml::DataContextChangedEventArgs ^ args); | ||||
|  | ||||
|         void OnVariableChanged(Platform::Object^ sender, CalculatorApp::ViewModel::VariableChangedEventArgs args); | ||||
|         void GraphVariablesUpdated(Platform::Object ^ sender, Object ^ args); | ||||
|         void OnVariableChanged(Platform::Object ^ sender, CalculatorApp::ViewModel::VariableChangedEventArgs args); | ||||
|         void OnEquationsVectorChanged( | ||||
|             Windows::Foundation::Collections::IObservableVector<CalculatorApp::ViewModel::EquationViewModel ^> ^ sender, | ||||
|             Windows::Foundation::Collections::IVectorChangedEventArgs ^ event); | ||||
|  | ||||
|         void TextBoxLosingFocus(Windows::UI::Xaml::Controls::TextBox^ textbox, Windows::UI::Xaml::Input::LosingFocusEventArgs^ args); | ||||
|         void TextBoxKeyDown(Windows::UI::Xaml::Controls::TextBox^ textbox, Windows::UI::Xaml::Input::KeyRoutedEventArgs^ e); | ||||
|         void SubmitTextbox(Windows::UI::Xaml::Controls::TextBox^ textbox); | ||||
|         void TextBoxLosingFocus(Windows::UI::Xaml::Controls::TextBox ^ textbox, Windows::UI::Xaml::Input::LosingFocusEventArgs ^ args); | ||||
|         void TextBoxKeyDown(Windows::UI::Xaml::Controls::TextBox ^ textbox, Windows::UI::Xaml::Input::KeyRoutedEventArgs ^ e); | ||||
|         void SubmitTextbox(Windows::UI::Xaml::Controls::TextBox ^ textbox); | ||||
|  | ||||
|         void OnZoomInCommand(Object ^ parameter); | ||||
|         void OnZoomOutCommand(Object ^ parameter); | ||||
|         void OnZoomResetCommand(Object ^ parameter); | ||||
|  | ||||
|         double validateDouble(Platform::String^ value, double defaultValue); | ||||
|         double validateDouble(Platform::String ^ value, double defaultValue); | ||||
|  | ||||
|         CalculatorApp::ViewModel::GraphingCalculatorViewModel^ m_viewModel; | ||||
|         CalculatorApp::ViewModel::GraphingCalculatorViewModel ^ m_viewModel; | ||||
|  | ||||
|         void OnShareClick(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); | ||||
|         void OnShareClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e); | ||||
|  | ||||
|         void OnShowTracePopupChanged(bool newValue); | ||||
|         void OnTracePointChanged(Windows::Foundation::Point newPoint); | ||||
|  | ||||
|  | ||||
|     private: | ||||
|         Windows::Foundation::EventRegistrationToken m_dataRequestedToken; | ||||
|         Windows::Foundation::EventRegistrationToken m_vectorChangedToken; | ||||
|         Windows::Foundation::EventRegistrationToken m_variableUpdatedToken; | ||||
|         void OnDataRequested(Windows::ApplicationModel::DataTransfer::DataTransferManager^ sender, Windows::ApplicationModel::DataTransfer::DataRequestedEventArgs^ e); | ||||
|         void OnDataRequested( | ||||
|             Windows::ApplicationModel::DataTransfer::DataTransferManager ^ sender, | ||||
|             Windows::ApplicationModel::DataTransfer::DataRequestedEventArgs ^ e); | ||||
|  | ||||
|         void TextBoxGotFocus(Windows::UI::Xaml::Controls::TextBox^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); | ||||
|         void TextBoxGotFocus(Windows::UI::Xaml::Controls::TextBox ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e); | ||||
|         void OnActiveTracingClick(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e); | ||||
|         void GraphingControl_LostFocus(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e); | ||||
|         void GraphingControl_LosingFocus(Windows::UI::Xaml::UIElement ^ sender, Windows::UI::Xaml::Input::LosingFocusEventArgs ^ args); | ||||
| @@ -70,6 +76,9 @@ namespace CalculatorApp | ||||
|         void OnEquationKeyGraphFeaturesRequested(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e); | ||||
|         void OnKeyGraphFeaturesClosed(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e); | ||||
|         bool ActiveTracingOn; | ||||
|         void SwitchModeToggleButton_Checked(Platform::Object ^ sender, Windows::UI::Xaml::RoutedEventArgs ^ e); | ||||
|         void TraceValuePopup_SizeChanged(Platform::Object ^ sender, Windows::UI::Xaml::SizeChangedEventArgs ^ e); | ||||
|         void PositionGraphPopup(); | ||||
|     }; | ||||
|  | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user