Touch events again and some clean-up
This commit is contained in:
committed by
Raphael Coeffic
parent
81366e5ae6
commit
681c161dd3
@@ -22,10 +22,10 @@
|
|||||||
#include "opentx.h"
|
#include "opentx.h"
|
||||||
|
|
||||||
#include "LvglWrapper.h"
|
#include "LvglWrapper.h"
|
||||||
|
#include "view_main.h"
|
||||||
|
|
||||||
LvglWrapper* LvglWrapper::_instance = nullptr;
|
LvglWrapper* LvglWrapper::_instance = nullptr;
|
||||||
|
|
||||||
static lv_disp_drv_t disp_drv; /*A variable to hold the drivers. Must be static or global.*/
|
|
||||||
lv_disp_t * disp;
|
lv_disp_t * disp;
|
||||||
static lv_disp_draw_buf_t disp_buf;
|
static lv_disp_draw_buf_t disp_buf;
|
||||||
|
|
||||||
@@ -130,9 +130,11 @@ BitmapBuffer canBuf(BMP_RGB565, LCD_W, LCD_H, (uint16_t *)cbuf);
|
|||||||
|
|
||||||
extern BitmapBuffer * lcdFront;
|
extern BitmapBuffer * lcdFront;
|
||||||
extern BitmapBuffer * lcd;
|
extern BitmapBuffer * lcd;
|
||||||
LvglWrapper::LvglWrapper()
|
|
||||||
|
static lv_disp_drv_t disp_drv;
|
||||||
|
|
||||||
|
static lv_disp_drv_t* init_disp_drv()
|
||||||
{
|
{
|
||||||
lv_init();
|
|
||||||
lv_disp_draw_buf_init(&disp_buf, lcdFront->getData(), lcd->getData(), LCD_W*LCD_H);
|
lv_disp_draw_buf_init(&disp_buf, lcdFront->getData(), lcd->getData(), LCD_W*LCD_H);
|
||||||
lv_disp_drv_init(&disp_drv); /*Basic initialization*/
|
lv_disp_drv_init(&disp_drv); /*Basic initialization*/
|
||||||
disp_drv.draw_buf = &disp_buf; /*Set an initialized buffer*/
|
disp_drv.draw_buf = &disp_buf; /*Set an initialized buffer*/
|
||||||
@@ -146,15 +148,15 @@ LvglWrapper::LvglWrapper()
|
|||||||
#endif
|
#endif
|
||||||
disp_drv.sw_rotate = 1;
|
disp_drv.sw_rotate = 1;
|
||||||
|
|
||||||
/*Register the driver in LVGL and save the created input device object*/
|
return &disp_drv;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void init_lvgl_drivers()
|
||||||
|
{
|
||||||
|
// Register the driver and save the created display objects
|
||||||
|
disp = lv_disp_drv_register(init_disp_drv());
|
||||||
|
|
||||||
disp = lv_disp_drv_register(&disp_drv); /*Register the driver and save the created display objects*/
|
// Register the driver in LVGL and save the created input device object
|
||||||
|
|
||||||
// create a canvas as the drawing target for libopenui as a hack. This is going to be removed
|
|
||||||
canvas = lv_canvas_create(lv_scr_act());
|
|
||||||
lv_canvas_set_buffer(canvas, cbuf, LCD_W, LCD_H, LV_IMG_CF_TRUE_COLOR);
|
|
||||||
|
|
||||||
lv_indev_drv_init(&touchDriver); /*Basic initialization*/
|
lv_indev_drv_init(&touchDriver); /*Basic initialization*/
|
||||||
touchDriver.type = LV_INDEV_TYPE_POINTER; /*See below.*/
|
touchDriver.type = LV_INDEV_TYPE_POINTER; /*See below.*/
|
||||||
touchDriver.read_cb = touchDriverRead; /*See below.*/
|
touchDriver.read_cb = touchDriverRead; /*See below.*/
|
||||||
@@ -166,6 +168,25 @@ LvglWrapper::LvglWrapper()
|
|||||||
lv_indev_drv_register(&keyboard_drv);
|
lv_indev_drv_register(&keyboard_drv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
LvglWrapper::LvglWrapper()
|
||||||
|
{
|
||||||
|
lv_init();
|
||||||
|
init_lvgl_drivers();
|
||||||
|
|
||||||
|
// Create a canvas as the drawing target for libopenui as a hack.
|
||||||
|
// This is going to be removed
|
||||||
|
//
|
||||||
|
canvas = lv_canvas_create(lv_scr_act());
|
||||||
|
lv_canvas_set_buffer(canvas, cbuf, LCD_W, LCD_H, LV_IMG_CF_TRUE_COLOR);
|
||||||
|
lv_obj_set_style_bg_opa(canvas, LV_OPA_MAX, LV_PART_MAIN);
|
||||||
|
|
||||||
|
auto window = MainWindow::instance();
|
||||||
|
lv_obj_set_parent(canvas, window->getLvObj());
|
||||||
|
lv_obj_move_background(canvas);
|
||||||
|
lv_scr_load(window->getLvObj());
|
||||||
|
lv_obj_invalidate(canvas);
|
||||||
|
}
|
||||||
|
|
||||||
void LvglWrapper::run()
|
void LvglWrapper::run()
|
||||||
{
|
{
|
||||||
tmr10ms_t tick = get_tmr10ms();
|
tmr10ms_t tick = get_tmr10ms();
|
||||||
|
|||||||
@@ -114,11 +114,9 @@ bool BindRxChoiceMenu::onTouchEnd(coord_t x, coord_t y)
|
|||||||
// Note: onCancel() is not called when the menu is discarded
|
// Note: onCancel() is not called when the menu is discarded
|
||||||
// by clicking outside the menu window and the onCancel
|
// by clicking outside the menu window and the onCancel
|
||||||
// handler is not accessible from here
|
// handler is not accessible from here
|
||||||
if (!Window::onTouchEnd(x, y)) {
|
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
|
||||||
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
|
onKeyPress();
|
||||||
onKeyPress();
|
deleteLater();
|
||||||
deleteLater();
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ class RadioGhostModuleConfig: public Page
|
|||||||
|
|
||||||
#if defined(HARDWARE_KEYS)
|
#if defined(HARDWARE_KEYS)
|
||||||
void onEvent(event_t event) override;
|
void onEvent(event_t event) override;
|
||||||
void checkEvents();
|
void checkEvents() override;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@@ -51,6 +51,8 @@ ViewMain::ViewMain():
|
|||||||
lv_obj_add_flag(lvobj, LV_OBJ_FLAG_EVENT_BUBBLE);
|
lv_obj_add_flag(lvobj, LV_OBJ_FLAG_EVENT_BUBBLE);
|
||||||
lv_obj_set_user_data(tile_view, this);
|
lv_obj_set_user_data(tile_view, this);
|
||||||
|
|
||||||
|
lv_obj_set_style_bg_opa(tile_view, LV_OPA_TRANSP, LV_PART_MAIN);
|
||||||
|
|
||||||
lv_obj_move_foreground(topbar->getLvObj());
|
lv_obj_move_foreground(topbar->getLvObj());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,6 +64,7 @@ ViewMain::~ViewMain()
|
|||||||
void ViewMain::addMainView(Window* view, uint32_t viewId)
|
void ViewMain::addMainView(Window* view, uint32_t viewId)
|
||||||
{
|
{
|
||||||
auto tile = lv_tileview_add_tile(tile_view, viewId, 0, LV_DIR_LEFT | LV_DIR_RIGHT);
|
auto tile = lv_tileview_add_tile(tile_view, viewId, 0, LV_DIR_LEFT | LV_DIR_RIGHT);
|
||||||
|
lv_obj_add_flag(tile, LV_OBJ_FLAG_EVENT_BUBBLE);
|
||||||
lv_obj_set_user_data(tile, view);
|
lv_obj_set_user_data(tile, view);
|
||||||
|
|
||||||
view->setLeft(lv_obj_get_x(tile));
|
view->setLeft(lv_obj_get_x(tile));
|
||||||
@@ -203,18 +206,16 @@ void ViewMain::setScrollPositionY(coord_t value)
|
|||||||
|
|
||||||
bool ViewMain::onTouchEnd(coord_t x, coord_t y)
|
bool ViewMain::onTouchEnd(coord_t x, coord_t y)
|
||||||
{
|
{
|
||||||
if (Window::onTouchEnd(x,y)) return true;
|
openMenu();
|
||||||
if (!hasFocus()) {
|
|
||||||
setFocus();
|
// TODO: remove this hack to preset
|
||||||
}
|
// the scrolling on the main menu
|
||||||
else {
|
int x1 = x;
|
||||||
openMenu();
|
int w1 = getParent()->width();
|
||||||
int x1 = x;
|
while (x1 > w1) x1 -= w1;
|
||||||
int w1 = getParent()->width();
|
if (x1 > w1 / 2)
|
||||||
while (x1 > w1) x1 -= w1;
|
pushEvent(EVT_ROTARY_LEFT);
|
||||||
if (x1 > w1 / 2)
|
|
||||||
pushEvent(EVT_ROTARY_LEFT);
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -34,9 +34,7 @@
|
|||||||
#include "view_text.h"
|
#include "view_text.h"
|
||||||
|
|
||||||
|
|
||||||
LvglWidgetFactory viewMainFactory = LvglWidgetFactory([] (lv_obj_t *parent) {
|
static LvglWidgetFactory viewMainFactory = {lv_obj_create, nullptr};
|
||||||
return lv_obj_create(nullptr);
|
|
||||||
});
|
|
||||||
|
|
||||||
ViewMainMenu::ViewMainMenu(Window* parent) :
|
ViewMainMenu::ViewMainMenu(Window* parent) :
|
||||||
Window(parent->getFullScreenWindow(), {}, 0, 0, &viewMainFactory)
|
Window(parent->getFullScreenWindow(), {}, 0, 0, &viewMainFactory)
|
||||||
|
|||||||
@@ -34,10 +34,8 @@ public:
|
|||||||
bool onTouchStart(coord_t /*x*/, coord_t /*y*/) override { return true; }
|
bool onTouchStart(coord_t /*x*/, coord_t /*y*/) override { return true; }
|
||||||
bool onTouchEnd(coord_t x, coord_t y) override
|
bool onTouchEnd(coord_t x, coord_t y) override
|
||||||
{
|
{
|
||||||
if (!Window::onTouchEnd(x, y)) {
|
onKeyPress();
|
||||||
onKeyPress();
|
deleteLater();
|
||||||
deleteLater();
|
|
||||||
}
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY,
|
bool onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY,
|
||||||
|
|||||||
@@ -76,16 +76,10 @@ bool Widget::onTouchEnd(coord_t x, coord_t y)
|
|||||||
TRACE_WINDOWS("Widget received touch end (%d) x=%d;y=%d",
|
TRACE_WINDOWS("Widget received touch end (%d) x=%d;y=%d",
|
||||||
hasFocus(), x, y);
|
hasFocus(), x, y);
|
||||||
|
|
||||||
if (fullscreen) {
|
|
||||||
//TODO: forward to widget (lua for instance)
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Window::onTouchEnd(x, y)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasFocus()) {
|
if (hasFocus()) {
|
||||||
|
|
||||||
|
// TODO: find a better way
|
||||||
if (touchState.tapCount == 0)
|
if (touchState.tapCount == 0)
|
||||||
onPress();
|
onPress();
|
||||||
else if (touchState.tapCount > 1)
|
else if (touchState.tapCount > 1)
|
||||||
@@ -94,6 +88,7 @@ bool Widget::onTouchEnd(coord_t x, coord_t y)
|
|||||||
else {
|
else {
|
||||||
setFocus();
|
setFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
Submodule radio/src/thirdparty/libopenui updated: af50430828...fef30535c6
Reference in New Issue
Block a user