Add TouchModes : in Gestures mode, only 1 event is processed for each touchevent. This allows to recognize gesture and handle them in Screens or in DisplayApp.
In Polling mode, X/Y positions are sent continuously to lvgl, allowing to scroll inside a dropdown menu for example.
This commit is contained in:
parent
e6a1aff6ce
commit
7d3af600bd
|
@ -287,6 +287,8 @@ set(LVGL_SRC
|
||||||
libs/lvgl/src/lv_objx/lv_bar.h
|
libs/lvgl/src/lv_objx/lv_bar.h
|
||||||
libs/lvgl/src/lv_objx/lv_slider.h
|
libs/lvgl/src/lv_objx/lv_slider.h
|
||||||
libs/lvgl/src/lv_objx/lv_slider.c
|
libs/lvgl/src/lv_objx/lv_slider.c
|
||||||
|
libs/lvgl/src/lv_objx/lv_ddlist.c
|
||||||
|
libs/lvgl/src/lv_objx/lv_ddlist.h
|
||||||
)
|
)
|
||||||
|
|
||||||
list(APPEND IMAGE_FILES
|
list(APPEND IMAGE_FILES
|
||||||
|
@ -327,6 +329,7 @@ list(APPEND SOURCE_FILES
|
||||||
DisplayApp/Screens/Tile.cpp
|
DisplayApp/Screens/Tile.cpp
|
||||||
DisplayApp/Screens/Meter.cpp
|
DisplayApp/Screens/Meter.cpp
|
||||||
DisplayApp/Screens/Gauge.cpp
|
DisplayApp/Screens/Gauge.cpp
|
||||||
|
DisplayApp/Screens/DropDownDemo.cpp
|
||||||
DisplayApp/Screens/Modal.cpp
|
DisplayApp/Screens/Modal.cpp
|
||||||
DisplayApp/Screens/BatteryIcon.cpp
|
DisplayApp/Screens/BatteryIcon.cpp
|
||||||
DisplayApp/Screens/BleIcon.cpp
|
DisplayApp/Screens/BleIcon.cpp
|
||||||
|
@ -400,6 +403,7 @@ set(INCLUDE_FILES
|
||||||
DisplayApp/Screens/Tile.h
|
DisplayApp/Screens/Tile.h
|
||||||
DisplayApp/Screens/Meter.h
|
DisplayApp/Screens/Meter.h
|
||||||
DisplayApp/Screens/Gauge.h
|
DisplayApp/Screens/Gauge.h
|
||||||
|
DisplayApp/Screens/DropDownDemo.h
|
||||||
DisplayApp/Screens/Modal.h
|
DisplayApp/Screens/Modal.h
|
||||||
DisplayApp/Screens/BatteryIcon.h
|
DisplayApp/Screens/BatteryIcon.h
|
||||||
DisplayApp/Screens/BleIcon.cpp
|
DisplayApp/Screens/BleIcon.cpp
|
||||||
|
|
|
@ -171,6 +171,12 @@ void DisplayApp::Refresh() {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(touchMode == TouchModes::Polling) {
|
||||||
|
auto info = touchPanel.GetTouchInfo();
|
||||||
|
if(info.action == 2) // 2 = contact
|
||||||
|
lvgl.SetNewTapEvent(info.x, info.y);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DisplayApp::RunningState() {
|
void DisplayApp::RunningState() {
|
||||||
|
@ -219,6 +225,7 @@ TouchEvents DisplayApp::OnTouchEvent() {
|
||||||
if(info.isTouch) {
|
if(info.isTouch) {
|
||||||
switch(info.gesture) {
|
switch(info.gesture) {
|
||||||
case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
|
case Pinetime::Drivers::Cst816S::Gestures::SingleTap:
|
||||||
|
if(touchMode == TouchModes::Gestures)
|
||||||
lvgl.SetNewTapEvent(info.x, info.y);
|
lvgl.SetNewTapEvent(info.x, info.y);
|
||||||
return TouchEvents::Tap;
|
return TouchEvents::Tap;
|
||||||
case Pinetime::Drivers::Cst816S::Gestures::LongPress:
|
case Pinetime::Drivers::Cst816S::Gestures::LongPress:
|
||||||
|
@ -257,3 +264,7 @@ void DisplayApp::SetFullRefresh(DisplayApp::FullRefreshDirections direction) {
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void DisplayApp::SetTouchMode(DisplayApp::TouchModes mode) {
|
||||||
|
touchMode = mode;
|
||||||
|
}
|
||||||
|
|
|
@ -34,6 +34,7 @@ namespace Pinetime {
|
||||||
NewNotification, BleFirmwareUpdateStarted };
|
NewNotification, BleFirmwareUpdateStarted };
|
||||||
|
|
||||||
enum class FullRefreshDirections { None, Up, Down };
|
enum class FullRefreshDirections { None, Up, Down };
|
||||||
|
enum class TouchModes { Gestures, Polling };
|
||||||
|
|
||||||
DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Drivers::Cst816S &,
|
DisplayApp(Drivers::St7789 &lcd, Components::LittleVgl &lvgl, Drivers::Cst816S &,
|
||||||
Controllers::Battery &batteryController, Controllers::Ble &bleController,
|
Controllers::Battery &batteryController, Controllers::Ble &bleController,
|
||||||
|
@ -46,6 +47,8 @@ namespace Pinetime {
|
||||||
void StartApp(Apps app);
|
void StartApp(Apps app);
|
||||||
|
|
||||||
void SetFullRefresh(FullRefreshDirections direction);
|
void SetFullRefresh(FullRefreshDirections direction);
|
||||||
|
void SetTouchMode(TouchModes mode);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
TaskHandle_t taskHandle;
|
TaskHandle_t taskHandle;
|
||||||
static void Process(void* instance);
|
static void Process(void* instance);
|
||||||
|
@ -81,6 +84,7 @@ namespace Pinetime {
|
||||||
std::unique_ptr<Screens::Modal> modal;
|
std::unique_ptr<Screens::Modal> modal;
|
||||||
Pinetime::Controllers::NotificationManager& notificationManager;
|
Pinetime::Controllers::NotificationManager& notificationManager;
|
||||||
Pinetime::Controllers::FirmwareValidator validator;
|
Pinetime::Controllers::FirmwareValidator validator;
|
||||||
|
TouchModes touchMode = TouchModes::Gestures;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
64
src/DisplayApp/Screens/DropDownDemo.cpp
Normal file
64
src/DisplayApp/Screens/DropDownDemo.cpp
Normal file
|
@ -0,0 +1,64 @@
|
||||||
|
#include <libs/lvgl/lvgl.h>
|
||||||
|
#include <libraries/log/nrf_log.h>
|
||||||
|
#include "DropDownDemo.h"
|
||||||
|
#include "../DisplayApp.h"
|
||||||
|
|
||||||
|
using namespace Pinetime::Applications::Screens;
|
||||||
|
extern lv_font_t jetbrains_mono_extrabold_compressed;
|
||||||
|
extern lv_font_t jetbrains_mono_bold_20;
|
||||||
|
|
||||||
|
DropDownDemo::DropDownDemo(Pinetime::Applications::DisplayApp *app) : Screen(app) {
|
||||||
|
// Create the dropdown object, with many item, and fix its height
|
||||||
|
ddlist = lv_ddlist_create(lv_scr_act(), NULL);
|
||||||
|
lv_ddlist_set_options(ddlist, "Apple\n"
|
||||||
|
"Banana\n"
|
||||||
|
"Orange\n"
|
||||||
|
"Melon\n"
|
||||||
|
"Grape\n"
|
||||||
|
"Raspberry\n"
|
||||||
|
"A\n"
|
||||||
|
"B\n"
|
||||||
|
"C\n"
|
||||||
|
"D\n"
|
||||||
|
"E");
|
||||||
|
lv_ddlist_set_fix_width(ddlist, 150);
|
||||||
|
lv_ddlist_set_draw_arrow(ddlist, true);
|
||||||
|
lv_ddlist_set_fix_height(ddlist, 150);
|
||||||
|
lv_obj_align(ddlist, NULL, LV_ALIGN_IN_TOP_MID, 0, 20);
|
||||||
|
}
|
||||||
|
|
||||||
|
DropDownDemo::~DropDownDemo() {
|
||||||
|
// Reset the touchmode
|
||||||
|
app->SetTouchMode(DisplayApp::TouchModes::Gestures);
|
||||||
|
lv_obj_clean(lv_scr_act());
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DropDownDemo::Refresh() {
|
||||||
|
auto* list = static_cast<lv_ddlist_ext_t *>(ddlist->ext_attr);
|
||||||
|
|
||||||
|
// Switch touchmode to Polling if the dropdown is opened. This will allow to scroll inside the
|
||||||
|
// dropdown while it is opened.
|
||||||
|
// Disable the polling mode when the dropdown is closed to be able to handle the gestures.
|
||||||
|
if(list->opened)
|
||||||
|
app->SetTouchMode(DisplayApp::TouchModes::Polling);
|
||||||
|
else
|
||||||
|
app->SetTouchMode(DisplayApp::TouchModes::Gestures);
|
||||||
|
return running;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DropDownDemo::OnButtonPushed() {
|
||||||
|
running = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool DropDownDemo::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
|
||||||
|
// If the dropdown is opened, notify Display app that it doesn't need to handle the event
|
||||||
|
// (this will prevent displayApp from going back to the menu or clock scree).
|
||||||
|
auto* list = static_cast<lv_ddlist_ext_t *>(ddlist->ext_attr);
|
||||||
|
if(list->opened) {
|
||||||
|
return true;
|
||||||
|
} else {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
29
src/DisplayApp/Screens/DropDownDemo.h
Normal file
29
src/DisplayApp/Screens/DropDownDemo.h
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include "Screen.h"
|
||||||
|
#include <bits/unique_ptr.h>
|
||||||
|
#include <libs/lvgl/src/lv_core/lv_style.h>
|
||||||
|
#include <libs/lvgl/src/lv_core/lv_obj.h>
|
||||||
|
|
||||||
|
namespace Pinetime {
|
||||||
|
namespace Applications {
|
||||||
|
namespace Screens {
|
||||||
|
|
||||||
|
class DropDownDemo : public Screen{
|
||||||
|
public:
|
||||||
|
DropDownDemo(DisplayApp* app);
|
||||||
|
~DropDownDemo() override;
|
||||||
|
|
||||||
|
bool Refresh() override;
|
||||||
|
bool OnButtonPushed() override;
|
||||||
|
bool OnTouchEvent(TouchEvents event) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
lv_obj_t * ddlist;
|
||||||
|
bool running = true;
|
||||||
|
bool isDropDownOpened = false;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue