Update color picker (#668)
This commit is contained in:
@@ -3,7 +3,6 @@
|
||||
|
||||
#include "pch.h"
|
||||
#include "EquationTextBox.h"
|
||||
#include "CalcViewModel/GraphingCalculator/EquationViewModel.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace Platform;
|
||||
@@ -72,6 +71,8 @@ void EquationTextBox::OnApplyTemplate()
|
||||
ColorChooserFlyout->Opened += ref new EventHandler<Object ^>(this, &EquationTextBox::OnColorFlyoutOpened);
|
||||
ColorChooserFlyout->Closed += ref new EventHandler<Object ^>(this, &EquationTextBox::OnColorFlyoutClosed);
|
||||
}
|
||||
|
||||
UpdateCommonVisualState();
|
||||
}
|
||||
|
||||
void EquationTextBox::OnPointerEntered(PointerRoutedEventArgs ^ e)
|
||||
@@ -260,6 +261,5 @@ bool EquationTextBox::ShouldDeleteButtonBeVisible()
|
||||
{
|
||||
m_richEditBox->TextDocument->GetMath(&text);
|
||||
}
|
||||
|
||||
return (!text->IsEmpty() && m_isFocused);
|
||||
}
|
||||
|
@@ -4,6 +4,7 @@
|
||||
#pragma once
|
||||
|
||||
#include "CalcViewModel/Common/Utils.h"
|
||||
#include "CalcViewModel/GraphingCalculator/EquationViewModel.h"
|
||||
|
||||
namespace CalculatorApp
|
||||
{
|
||||
|
Reference in New Issue
Block a user