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

fix bugs (#934)

Browse Source
This commit is contained in:
Pepe Rivera
2020-01-14 13:52:57 -08:00
committed by GitHub
parent 027eab12a3
commit ca0b3d83e8
4 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -273,19 +273,24 @@ void EquationTextBox::UpdateButtonsVisualState()
void EquationTextBox::UpdateCommonVisualState()
{
String ^ state = nullptr;
bool richEditHasContent = RichEditHasContent();
if (m_HasFocus && HasError)
{
state = "FocusedError";
}
else if (IsAddEquationMode && ((m_HasFocus || m_isPointerOver) && !RichEditHasContent()))
else if (IsAddEquationMode && m_HasFocus && !richEditHasContent)
{
state = "AddEquation";
state = "AddEquationFocused";
}
else if (m_HasFocus)
{
state = "Focused";
}
else if (IsAddEquationMode && m_isPointerOver && !richEditHasContent)
{
state = "AddEquation";
}
else if (HasError && (m_isPointerOver || m_isColorChooserFlyoutOpen))
{
state = "PointerOverError";

10
src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
View File

@@ -305,6 +305,16 @@
<Setter Target="EquationButton.IsEnabled" Value="false"/>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="AddEquationFocused">
<VisualState.Setters>
<Setter Target="FunctionNumberLabelTextBlock.Visibility" Value="Collapsed"/>
<Setter Target="EquationButton.Background" Value="{ThemeResource EquationButtonHideLineBackgroundBrush}"/>
<Setter Target="EquationButton.BorderBrush" Value="{ThemeResource EquationButtonHideLineBackgroundBrush}"/>
<Setter Target="EquationButton.Foreground" Value="{ThemeResource EquationButtonHideLineForegroundBrush}"/>
<Setter Target="EquationButton.IsEnabled" Value="false"/>
<Setter Target="EquationBoxBorder.Background" Value="{ThemeResource TextBoxBackgroundThemeBrush}"/>
</VisualState.Setters>
</VisualState>
<VisualState x:Name="Error">
<VisualState.Setters>
<Setter Target="MathRichEditBox.PlaceholderText" Value=""/>