Merge master into feature/GraphingCalculator branch (#585)
* Merge master into feature/GraphingCalculator branch
This commit is contained in:
@@ -20,31 +20,31 @@ using namespace Windows::UI::Xaml::Navigation;
|
||||
using namespace Windows::UI::ViewManagement;
|
||||
using namespace Windows::UI::Core;
|
||||
|
||||
CalculatorProgrammerDisplayPanel::CalculatorProgrammerDisplayPanel() :
|
||||
m_isErrorVisualState(false)
|
||||
CalculatorProgrammerDisplayPanel::CalculatorProgrammerDisplayPanel()
|
||||
: m_isErrorVisualState(false)
|
||||
{
|
||||
InitializeComponent();
|
||||
}
|
||||
|
||||
void CalculatorProgrammerDisplayPanel::ShowBitFlip(Object^ sender, RoutedEventArgs^ e)
|
||||
void CalculatorProgrammerDisplayPanel::ShowBitFlip(Object ^ sender, RoutedEventArgs ^ e)
|
||||
{
|
||||
TraceLogger::GetInstance().LogBitFlipPaneClicked();
|
||||
}
|
||||
|
||||
void CalculatorProgrammerDisplayPanel::OnBitLengthButtonPressed(Object^ parameter)
|
||||
void CalculatorProgrammerDisplayPanel::OnBitLengthButtonPressed(Object ^ parameter)
|
||||
{
|
||||
TraceLogger::GetInstance().LogBitLengthButtonUsed(ApplicationView::GetApplicationViewIdForWindow(CoreWindow::GetForCurrentThread()));
|
||||
String^ buttonId = parameter->ToString();
|
||||
String ^ buttonId = parameter->ToString();
|
||||
|
||||
qwordButton->Visibility = ::Visibility::Collapsed;
|
||||
dwordButton->Visibility = ::Visibility::Collapsed;
|
||||
wordButton->Visibility = ::Visibility::Collapsed;
|
||||
byteButton->Visibility = ::Visibility::Collapsed;
|
||||
QwordButton->Visibility = ::Visibility::Collapsed;
|
||||
DwordButton->Visibility = ::Visibility::Collapsed;
|
||||
WordButton->Visibility = ::Visibility::Collapsed;
|
||||
ByteButton->Visibility = ::Visibility::Collapsed;
|
||||
if (buttonId == "0")
|
||||
{
|
||||
Model->ButtonPressed->Execute(NumbersAndOperatorsEnum::Dword);
|
||||
dwordButton->Visibility = ::Visibility::Visible;
|
||||
dwordButton->Focus(::FocusState::Programmatic);
|
||||
DwordButton->Visibility = ::Visibility::Visible;
|
||||
DwordButton->Focus(::FocusState::Programmatic);
|
||||
Model->IsQwordEnabled = false;
|
||||
Model->IsDwordEnabled = true;
|
||||
Model->IsWordEnabled = true;
|
||||
@@ -52,8 +52,8 @@ void CalculatorProgrammerDisplayPanel::OnBitLengthButtonPressed(Object^ paramete
|
||||
else if (buttonId == "1")
|
||||
{
|
||||
Model->ButtonPressed->Execute(NumbersAndOperatorsEnum::Word);
|
||||
wordButton->Visibility = ::Visibility::Visible;
|
||||
wordButton->Focus(::FocusState::Programmatic);
|
||||
WordButton->Visibility = ::Visibility::Visible;
|
||||
WordButton->Focus(::FocusState::Programmatic);
|
||||
Model->IsQwordEnabled = false;
|
||||
Model->IsDwordEnabled = false;
|
||||
Model->IsWordEnabled = true;
|
||||
@@ -61,8 +61,8 @@ void CalculatorProgrammerDisplayPanel::OnBitLengthButtonPressed(Object^ paramete
|
||||
else if (buttonId == "2")
|
||||
{
|
||||
Model->ButtonPressed->Execute(NumbersAndOperatorsEnum::Byte);
|
||||
byteButton->Visibility = ::Visibility::Visible;
|
||||
byteButton->Focus(::FocusState::Programmatic);
|
||||
ByteButton->Visibility = ::Visibility::Visible;
|
||||
ByteButton->Focus(::FocusState::Programmatic);
|
||||
Model->IsQwordEnabled = false;
|
||||
Model->IsDwordEnabled = false;
|
||||
Model->IsWordEnabled = false;
|
||||
@@ -70,8 +70,8 @@ void CalculatorProgrammerDisplayPanel::OnBitLengthButtonPressed(Object^ paramete
|
||||
else if (buttonId == "3")
|
||||
{
|
||||
Model->ButtonPressed->Execute(NumbersAndOperatorsEnum::Qword);
|
||||
qwordButton->Visibility = ::Visibility::Visible;
|
||||
qwordButton->Focus(::FocusState::Programmatic);
|
||||
QwordButton->Visibility = ::Visibility::Visible;
|
||||
QwordButton->Focus(::FocusState::Programmatic);
|
||||
Model->IsQwordEnabled = true;
|
||||
Model->IsDwordEnabled = true;
|
||||
Model->IsWordEnabled = true;
|
||||
@@ -90,7 +90,7 @@ void CalculatorProgrammerDisplayPanel::IsErrorVisualState::set(bool value)
|
||||
if (m_isErrorVisualState != value)
|
||||
{
|
||||
m_isErrorVisualState = value;
|
||||
String^ newState = m_isErrorVisualState ? L"ErrorLayout" : L"NoErrorLayout";
|
||||
String ^ newState = m_isErrorVisualState ? L"ErrorLayout" : L"NoErrorLayout";
|
||||
VisualStateManager::GoToState(this, newState, false);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user