i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix radian/degree mode toggling bug in Deskcalc

Browse Source 
I overlooked this problem in my last commit...

If you select the current angle (radian/degree) mode from the menu
it toggles the angle mode, fixed this to make it keep the current
mode.
This commit is contained in:
John Scipione
2012-07-31 08:01:32 -04:00
parent bd97ee39e0
commit fa37d94d1b
3 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskcalc/CalcView.cpp
+12 -8
View File
@@ -245,8 +245,12 @@ CalcView::MessageReceived(BMessage* message)
ToggleAudioFeedback();
return;
case MSG_OPTIONS_ANGLE_MODE:
ToggleAngleMode();
case MSG_OPTIONS_ANGLE_MODE_RADIAN:
SetDegreeMode(false);
return;
case MSG_OPTIONS_ANGLE_MODE_DEGREE:
SetDegreeMode(true);
return;
}
}
@@ -977,11 +981,11 @@ CalcView::ToggleAudioFeedback(void)
void
CalcView::ToggleAngleMode(void)
CalcView::SetDegreeMode(bool degrees)
{
fOptions->degree_mode = !fOptions->degree_mode;
fAngleModeRadianItem->SetMarked(!fOptions->degree_mode);
fAngleModeDegreeItem->SetMarked(fOptions->degree_mode);
fOptions->degree_mode = degrees;
fAngleModeRadianItem->SetMarked(!degrees);
fAngleModeDegreeItem->SetMarked(degrees);
}
@@ -1273,9 +1277,9 @@ CalcView::_CreatePopUpMenu(bool addKeypadModeMenuItems)
fAudioFeedbackItem = new BMenuItem(B_TRANSLATE("Audio Feedback"),
new BMessage(MSG_OPTIONS_AUDIO_FEEDBACK));
fAngleModeRadianItem = new BMenuItem(B_TRANSLATE("Radian Mode"),
new BMessage(MSG_OPTIONS_ANGLE_MODE));
new BMessage(MSG_OPTIONS_ANGLE_MODE_RADIAN));
fAngleModeDegreeItem = new BMenuItem(B_TRANSLATE("Degree Mode"),
new BMessage(MSG_OPTIONS_ANGLE_MODE));
new BMessage(MSG_OPTIONS_ANGLE_MODE_DEGREE));
if (addKeypadModeMenuItems) {
fKeypadModeCompactItem = new BMenuItem(B_TRANSLATE("Compact"),
new BMessage(MSG_OPTIONS_KEYPAD_MODE_COMPACT), '0');