UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion][apps] Remove redundant AlphaLockShift state

Browse Source 
Since the 'shift' key can now toggle between the AlphaLock and
ShiftAlphaLock states, there is no way to enter the AlphaLockShift
state, so remove it.
This commit is contained in:
Ian Abbott
2017-09-08 16:15:09 +01:00
committed by EmilieNumworks
parent 68eacca570
commit 357d76515b
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/shift_alpha_lock_view.cpp
View File

@@ -17,7 +17,6 @@ bool ShiftAlphaLockView::setStatus(Ion::Events::ShiftAlphaStatus status) {
switch (m_status) {
case Ion::Events::ShiftAlphaStatus::Alpha:
case Ion::Events::ShiftAlphaStatus::AlphaLock:
case Ion::Events::ShiftAlphaStatus::AlphaLockShift:
m_shiftAlphaView.setMessage(I18n::Message::Alpha);
break;
case Ion::Events::ShiftAlphaStatus::ShiftAlpha:
@@ -51,7 +50,6 @@ int ShiftAlphaLockView::numberOfSubviews() const {
case Ion::Events::ShiftAlphaStatus::ShiftAlpha:
return 1;
case Ion::Events::ShiftAlphaStatus::AlphaLock:
case Ion::Events::ShiftAlphaStatus::AlphaLockShift:
case Ion::Events::ShiftAlphaStatus::ShiftAlphaLock:
return 2;
case Ion::Events::ShiftAlphaStatus::Default:

1
ion/include/ion/events.h
View File

@@ -43,7 +43,6 @@ enum class ShiftAlphaStatus {
Alpha,
ShiftAlpha,
AlphaLock,
AlphaLockShift,
ShiftAlphaLock,
};

11
ion/src/shared/events_modifier.cpp
View File

@@ -11,11 +11,11 @@ ShiftAlphaStatus shiftAlphaStatus() {
}
bool isShiftActive() {
return sShiftAlphaStatus == ShiftAlphaStatus::Shift || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlpha || sShiftAlphaStatus == ShiftAlphaStatus::AlphaLockShift || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlphaLock;
return sShiftAlphaStatus == ShiftAlphaStatus::Shift || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlpha || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlphaLock;
}
bool isAlphaActive() {
return sShiftAlphaStatus == ShiftAlphaStatus::Alpha || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlpha || sShiftAlphaStatus == ShiftAlphaStatus::AlphaLock || sShiftAlphaStatus == ShiftAlphaStatus::AlphaLockShift || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlphaLock;
return sShiftAlphaStatus == ShiftAlphaStatus::Alpha || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlpha || sShiftAlphaStatus == ShiftAlphaStatus::AlphaLock || sShiftAlphaStatus == ShiftAlphaStatus::ShiftAlphaLock;
;
}
@@ -66,13 +66,6 @@ void updateModifiersFromEvent(Event e) {
sShiftAlphaStatus = ShiftAlphaStatus::Default;
}
break;
case ShiftAlphaStatus::AlphaLockShift: // no longer used
if (e == Alpha) {
sShiftAlphaStatus = ShiftAlphaStatus::Shift;
} else {
sShiftAlphaStatus = ShiftAlphaStatus::AlphaLock;
}
break;
case ShiftAlphaStatus::ShiftAlphaLock:
if (e == Shift) {
sShiftAlphaStatus = ShiftAlphaStatus::AlphaLock;