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

Fix focus for EquationTextBox (#787)

Browse Source
This commit is contained in:
Pepe Rivera 2019-11-13 13:10:05 -08:00 committed by GitHub
parent 442ed6a861
commit afc1b2146c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Calculator/Controls/EquationTextBox.cpp
View File

@ -142,7 +142,7 @@ void EquationTextBox::OnRichEditBoxTextChanged(Object ^ sender, RoutedEventArgs
void EquationTextBox::OnRichEditBoxGotFocus(Object ^ sender, RoutedEventArgs ^ e) void EquationTextBox::OnRichEditBoxGotFocus(Object ^ sender, RoutedEventArgs ^ e)
{ {
m_isFocused = true; m_HasFocus = true;
UpdateCommonVisualState(); UpdateCommonVisualState();
UpdateDeleteButtonVisualState(); UpdateDeleteButtonVisualState();
} }
@ -151,7 +151,7 @@ void EquationTextBox::OnRichEditBoxLostFocus(Object ^ sender, RoutedEventArgs ^
{ {
if (!m_richEditBox->ContextFlyout->IsOpen) if (!m_richEditBox->ContextFlyout->IsOpen)
{ {
m_isFocused = false; m_HasFocus = false;
} }
UpdateCommonVisualState(); UpdateCommonVisualState();
UpdateDeleteButtonVisualState(); UpdateDeleteButtonVisualState();
@ -222,7 +222,7 @@ void EquationTextBox::UpdateCommonVisualState()
{ {
String ^ state = "Normal"; String ^ state = "Normal";
if (m_isFocused) if (m_HasFocus)
{ {
state = "Focused"; state = "Focused";
} }
@ -271,5 +271,5 @@ bool EquationTextBox::ShouldDeleteButtonBeVisible()
{ {
text = m_richEditBox->MathText; text = m_richEditBox->MathText;
} }
return (!text->IsEmpty() && m_isFocused); return (!text->IsEmpty() && m_HasFocus);
} }

3
src/Calculator/Controls/EquationTextBox.h
View File

@ -22,6 +22,8 @@ namespace CalculatorApp
DEPENDENCY_PROPERTY(Windows::UI::Xaml::Media::SolidColorBrush^, EquationColor); DEPENDENCY_PROPERTY(Windows::UI::Xaml::Media::SolidColorBrush^, EquationColor);
DEPENDENCY_PROPERTY(Windows::UI::Xaml::Controls::Flyout^, ColorChooserFlyout); DEPENDENCY_PROPERTY(Windows::UI::Xaml::Controls::Flyout^, ColorChooserFlyout);
PROPERTY_R(bool, HasFocus);
event Windows::UI::Xaml::RoutedEventHandler ^ RemoveButtonClicked; event Windows::UI::Xaml::RoutedEventHandler ^ RemoveButtonClicked;
event Windows::UI::Xaml::RoutedEventHandler ^ KeyGraphFeaturesButtonClicked; event Windows::UI::Xaml::RoutedEventHandler ^ KeyGraphFeaturesButtonClicked;
event Windows::UI::Xaml::RoutedEventHandler ^ EquationSubmitted; event Windows::UI::Xaml::RoutedEventHandler ^ EquationSubmitted;
@ -64,7 +66,6 @@ namespace CalculatorApp
Windows::UI::Xaml::Controls::Button^ m_functionButton; Windows::UI::Xaml::Controls::Button^ m_functionButton;
Windows::UI::Xaml::Controls::Primitives::ToggleButton^ m_colorChooserButton; Windows::UI::Xaml::Controls::Primitives::ToggleButton^ m_colorChooserButton;
bool m_isFocused;
bool m_isPointerOver; bool m_isPointerOver;
bool m_isColorChooserFlyoutOpen; bool m_isColorChooserFlyoutOpen;
}; };

6
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml.cpp
View File

@ -87,7 +87,11 @@ void EquationInputArea::InputTextBox_Submitted(Object ^ sender, RoutedEventArgs
auto tb = static_cast<EquationTextBox ^>(sender); auto tb = static_cast<EquationTextBox ^>(sender);
auto eq = static_cast<EquationViewModel ^>(tb->DataContext); auto eq = static_cast<EquationViewModel ^>(tb->DataContext);
eq->Expression = tb->GetEquationText(); eq->Expression = tb->GetEquationText();
FocusManager::TryMoveFocus(::FocusNavigationDirection::Left);
if (tb->HasFocus)
{
FocusManager::TryMoveFocus(::FocusNavigationDirection::Left);
}
} }
void EquationInputArea::EquationTextBox_RemoveButtonClicked(Object ^ sender, RoutedEventArgs ^ e) void EquationInputArea::EquationTextBox_RemoveButtonClicked(Object ^ sender, RoutedEventArgs ^ e)