mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
Compare commits
3 commits
5b925375e7
...
167382d3bc
Author | SHA1 | Date | |
---|---|---|---|
167382d3bc | |||
5209aff159 | |||
99e5fab060 |
|
@ -314,6 +314,10 @@ void DisplayApp::Refresh() {
|
|||
} else {
|
||||
lcd.Sleep();
|
||||
}
|
||||
// Clear any ongoing touch pressed events
|
||||
// Without this LVGL gets stuck in the pressed state and will keep refreshing the
|
||||
// display activity timer causing the screen to never sleep after timeout
|
||||
lvgl.ClearTouchState();
|
||||
PushMessageToSystemTask(Pinetime::System::Messages::OnDisplayTaskSleeping);
|
||||
state = States::Idle;
|
||||
break;
|
||||
|
@ -459,7 +463,7 @@ void DisplayApp::Refresh() {
|
|||
}
|
||||
}
|
||||
|
||||
if (touchHandler.IsTouching()) {
|
||||
if (state == States::Running && touchHandler.IsTouching()) {
|
||||
currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
|
||||
}
|
||||
|
||||
|
|
|
@ -248,6 +248,8 @@ void LittleVgl::SetNewTouchPoint(int16_t x, int16_t y, bool contact) {
|
|||
}
|
||||
}
|
||||
|
||||
// Cancel an ongoing tap
|
||||
// Signifies that LVGL should not handle the current tap
|
||||
void LittleVgl::CancelTap() {
|
||||
if (tapped) {
|
||||
isCancelled = true;
|
||||
|
@ -255,6 +257,13 @@ void LittleVgl::CancelTap() {
|
|||
}
|
||||
}
|
||||
|
||||
// Clear the current tapped state
|
||||
// Signifies that touch input processing is suspended
|
||||
void LittleVgl::ClearTouchState() {
|
||||
touchPoint = {-1, -1};
|
||||
tapped = false;
|
||||
}
|
||||
|
||||
bool LittleVgl::GetTouchPadInfo(lv_indev_data_t* ptr) {
|
||||
ptr->point.x = touchPoint.x;
|
||||
ptr->point.y = touchPoint.y;
|
||||
|
|
|
@ -26,6 +26,7 @@ namespace Pinetime {
|
|||
void SetFullRefresh(FullRefreshDirections direction);
|
||||
void SetNewTouchPoint(int16_t x, int16_t y, bool contact);
|
||||
void CancelTap();
|
||||
void ClearTouchState();
|
||||
|
||||
bool GetFullRefresh() {
|
||||
bool returnValue = fullRefresh;
|
||||
|
|
|
@ -6,7 +6,6 @@ namespace Pinetime {
|
|||
enum class Messages : uint8_t {
|
||||
GoToSleep,
|
||||
GoToRunning,
|
||||
TouchWakeUp,
|
||||
OnNewTime,
|
||||
OnNewNotification,
|
||||
OnNewCall,
|
||||
|
|
|
@ -198,20 +198,6 @@ void SystemTask::Work() {
|
|||
case Messages::GoToRunning:
|
||||
GoToRunning();
|
||||
break;
|
||||
case Messages::TouchWakeUp: {
|
||||
if (touchHandler.ProcessTouchInfo(touchPanel.GetTouchInfo())) {
|
||||
auto gesture = touchHandler.GestureGet();
|
||||
if (settingsController.GetNotificationStatus() != Controllers::Settings::Notification::Sleep &&
|
||||
gesture != Pinetime::Applications::TouchEvents::None &&
|
||||
((gesture == Pinetime::Applications::TouchEvents::DoubleTap &&
|
||||
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) ||
|
||||
(gesture == Pinetime::Applications::TouchEvents::Tap &&
|
||||
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
|
||||
GoToRunning();
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
case Messages::GoToSleep:
|
||||
GoToSleep();
|
||||
break;
|
||||
|
@ -260,8 +246,23 @@ void SystemTask::Work() {
|
|||
// TODO add intent of fs access icon or something
|
||||
break;
|
||||
case Messages::OnTouchEvent:
|
||||
if (touchHandler.ProcessTouchInfo(touchPanel.GetTouchInfo())) {
|
||||
// Finish immediately if no new events
|
||||
if (!touchHandler.ProcessTouchInfo(touchPanel.GetTouchInfo())) {
|
||||
break;
|
||||
}
|
||||
if (state == SystemTaskState::Running) {
|
||||
displayApp.PushMessage(Pinetime::Applications::Display::Messages::TouchEvent);
|
||||
} else {
|
||||
// If asleep, check for touch panel wake triggers
|
||||
auto gesture = touchHandler.GestureGet();
|
||||
if (settingsController.GetNotificationStatus() != Controllers::Settings::Notification::Sleep &&
|
||||
gesture != Pinetime::Applications::TouchEvents::None &&
|
||||
((gesture == Pinetime::Applications::TouchEvents::DoubleTap &&
|
||||
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) ||
|
||||
(gesture == Pinetime::Applications::TouchEvents::Tap &&
|
||||
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap)))) {
|
||||
GoToRunning();
|
||||
}
|
||||
}
|
||||
break;
|
||||
case Messages::HandleButtonEvent: {
|
||||
|
@ -482,14 +483,7 @@ void SystemTask::HandleButtonAction(Controllers::ButtonActions action) {
|
|||
}
|
||||
|
||||
void SystemTask::OnTouchEvent() {
|
||||
if (state == SystemTaskState::Running) {
|
||||
PushMessage(Messages::OnTouchEvent);
|
||||
} else {
|
||||
if (settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::SingleTap) or
|
||||
settingsController.isWakeUpModeOn(Pinetime::Controllers::Settings::WakeUpMode::DoubleTap)) {
|
||||
PushMessage(Messages::TouchWakeUp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void SystemTask::PushMessage(System::Messages msg) {
|
||||
|
|
Loading…
Reference in a new issue