summaryrefslogtreecommitdiff
path: root/src/displayapp
diff options
context:
space:
mode:
authorRiku Isokoski <riksu9000@gmail.com>2021-07-16 11:55:29 +0300
committerRiku Isokoski <riksu9000@gmail.com>2021-07-16 11:55:29 +0300
commit329482f87308c185e970b141bcbfe9c83b46c4da (patch)
treed26143a1994f306c675e6f4f317c3ba457f102b3 /src/displayapp
parentbaffa1594f9c1a03a95f0cc10955e3cf8bf880ce (diff)
Fix remaining known issues
Diffstat (limited to 'src/displayapp')
-rw-r--r--src/displayapp/DisplayApp.cpp4
-rw-r--r--src/displayapp/screens/Tile.cpp3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index 945f182a..1ff8d51d 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -226,7 +226,9 @@ void DisplayApp::Refresh() {
}
}
- currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
+ if (touchHandler.IsTouching()) {
+ currentScreen->OnTouchEvent(touchHandler.GetX(), touchHandler.GetY());
+ }
if (nextApp != Apps::None) {
LoadApp(nextApp, nextDirection);
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp
index 5a40e915..8eb5eb0a 100644
--- a/src/displayapp/screens/Tile.cpp
+++ b/src/displayapp/screens/Tile.cpp
@@ -91,6 +91,7 @@ Tile::Tile(uint8_t screenID,
lv_obj_set_style_local_bg_color(btnm1, LV_BTNMATRIX_PART_BTN, LV_STATE_DISABLED, lv_color_hex(0x111111));
for (uint8_t i = 0; i < 6; i++) {
+ lv_btnmatrix_set_btn_ctrl(btnm1, i, LV_BTNMATRIX_CTRL_CLICK_TRIG);
if (applications[i].application == Apps::None) {
lv_btnmatrix_set_btn_ctrl(btnm1, i, LV_BTNMATRIX_CTRL_DISABLED);
}
@@ -123,7 +124,7 @@ bool Tile::Refresh() {
}
void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event) {
- if (event == LV_EVENT_CLICKED) {
+ if (event == LV_EVENT_VALUE_CHANGED) {
app->StartApp(apps[lv_btnmatrix_get_active_btn(obj)], DisplayApp::FullRefreshDirections::Up);
running = false;
}