Skip to content

Fix button bindings #2421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AZero13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix button bindings #2421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/Calculator/Views/CalculatorProgrammerDisplayPanel.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,29 +71,29 @@ private void OnBitLengthButtonPressed(object parameter)
WordButton.Visibility = Visibility.Collapsed;
ByteButton.Visibility = Visibility.Collapsed;
if (buttonId == "0")
{
Model.ValueBitLength = BitLength.BitLengthQWord;
QwordButton.Visibility = Visibility.Visible;
QwordButton.Focus(FocusState.Programmatic);
}
else if (buttonId == "1")
{
Model.ValueBitLength = BitLength.BitLengthDWord;
DwordButton.Visibility = Visibility.Visible;
DwordButton.Focus(FocusState.Programmatic);
}
else if (buttonId == "1")
else if (buttonId == "2")
{
Model.ValueBitLength = BitLength.BitLengthWord;
WordButton.Visibility = Visibility.Visible;
WordButton.Focus(FocusState.Programmatic);
}
else if (buttonId == "2")
else if (buttonId == "3")
{
Model.ValueBitLength = BitLength.BitLengthByte;
ByteButton.Visibility = Visibility.Visible;
ByteButton.Focus(FocusState.Programmatic);
}
else if (buttonId == "3")
{
Model.ValueBitLength = BitLength.BitLengthQWord;
QwordButton.Visibility = Visibility.Visible;
QwordButton.Focus(FocusState.Programmatic);
}
}

private bool m_isErrorVisualState;
Expand Down
14 changes: 7 additions & 7 deletions src/Calculator/Views/CalculatorScientificAngleButtons.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,23 @@ private void OnAngleButtonPressed(object commandParameter)
GradsButton.Visibility = Visibility.Collapsed;

if (buttonId == "0")
{
Model.SwitchAngleType(NumbersAndOperatorsEnum.Degree);
DegreeButton.Visibility = Visibility.Visible;
DegreeButton.Focus(FocusState.Programmatic);
}
else if (buttonId == "1")
{
Model.SwitchAngleType(NumbersAndOperatorsEnum.Radians);
RadianButton.Visibility = Visibility.Visible;
RadianButton.Focus(FocusState.Programmatic);
}
else if (buttonId == "1")
else if (buttonId == "2")
{
Model.SwitchAngleType(NumbersAndOperatorsEnum.Grads);
GradsButton.Visibility = Visibility.Visible;
GradsButton.Focus(FocusState.Programmatic);
}
else if (buttonId == "2")
{
Model.SwitchAngleType(NumbersAndOperatorsEnum.Degree);
DegreeButton.Visibility = Visibility.Visible;
DegreeButton.Focus(FocusState.Programmatic);
}
}

private void FToEButton_Toggled(object sender, RoutedEventArgs e)
Expand Down