From 357d76515bc63a2a4b375aebefcbc71bc0a6d947 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Fri, 8 Sep 2017 16:15:09 +0100 Subject: [PATCH] [ion][apps] Remove redundant AlphaLockShift state 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. --- apps/shift_alpha_lock_view.cpp | 2 -- ion/include/ion/events.h | 1 - ion/src/shared/events_modifier.cpp | 11 ++--------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/apps/shift_alpha_lock_view.cpp b/apps/shift_alpha_lock_view.cpp index 1d307481b..b3423173e 100644 --- a/apps/shift_alpha_lock_view.cpp +++ b/apps/shift_alpha_lock_view.cpp @@ -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: diff --git a/ion/include/ion/events.h b/ion/include/ion/events.h index 21adec95c..c9b1751b3 100644 --- a/ion/include/ion/events.h +++ b/ion/include/ion/events.h @@ -43,7 +43,6 @@ enum class ShiftAlphaStatus { Alpha, ShiftAlpha, AlphaLock, - AlphaLockShift, ShiftAlphaLock, }; diff --git a/ion/src/shared/events_modifier.cpp b/ion/src/shared/events_modifier.cpp index 8eb4568f1..d7d8f60d9 100644 --- a/ion/src/shared/events_modifier.cpp +++ b/ion/src/shared/events_modifier.cpp @@ -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;