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

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
commit afc1b2146c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 6 deletions
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)
{
m_isFocused = true;
m_HasFocus = true;
UpdateCommonVisualState();
UpdateDeleteButtonVisualState();
}
@ -151,7 +151,7 @@ void EquationTextBox::OnRichEditBoxLostFocus(Object ^ sender, RoutedEventArgs ^
{
if (!m_richEditBox->ContextFlyout->IsOpen)
{
m_isFocused = false;
m_HasFocus = false;
}
UpdateCommonVisualState();
UpdateDeleteButtonVisualState();
@ -222,7 +222,7 @@ void EquationTextBox::UpdateCommonVisualState()
{
String ^ state = "Normal";
if (m_isFocused)
if (m_HasFocus)
{
state = "Focused";
}
@ -271,5 +271,5 @@ bool EquationTextBox::ShouldDeleteButtonBeVisible()
{
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::Controls::Flyout^, ColorChooserFlyout);
PROPERTY_R(bool, HasFocus);
event Windows::UI::Xaml::RoutedEventHandler ^ RemoveButtonClicked;
event Windows::UI::Xaml::RoutedEventHandler ^ KeyGraphFeaturesButtonClicked;
event Windows::UI::Xaml::RoutedEventHandler ^ EquationSubmitted;
@ -64,7 +66,6 @@ namespace CalculatorApp
Windows::UI::Xaml::Controls::Button^ m_functionButton;
Windows::UI::Xaml::Controls::Primitives::ToggleButton^ m_colorChooserButton;
bool m_isFocused;
bool m_isPointerOver;
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 eq = static_cast<EquationViewModel ^>(tb->DataContext);
eq->Expression = tb->GetEquationText();
FocusManager::TryMoveFocus(::FocusNavigationDirection::Left);
if (tb->HasFocus)
{
FocusManager::TryMoveFocus(::FocusNavigationDirection::Left);
}
}
void EquationInputArea::EquationTextBox_RemoveButtonClicked(Object ^ sender, RoutedEventArgs ^ e)