main window: remove last rest of touch handling
This commit is contained in:
committed by
Raphael Coeffic
parent
7679077632
commit
6f15104bb4
+8
-46
@@ -22,73 +22,34 @@
|
|||||||
|
|
||||||
#include "lvgl/lvgl.h"
|
#include "lvgl/lvgl.h"
|
||||||
|
|
||||||
#if defined(HARDWARE_TOUCH)
|
|
||||||
#include "touch.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(HARDWARE_TOUCH)
|
|
||||||
TouchState touchState;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
MainWindow * MainWindow::_instance = nullptr;
|
MainWindow * MainWindow::_instance = nullptr;
|
||||||
|
|
||||||
MainWindow::MainWindow() :
|
MainWindow::MainWindow() :
|
||||||
Window(nullptr, {0, 0, LCD_W, LCD_H}, OPAQUE),
|
Window(nullptr, {0, 0, LCD_W, LCD_H}, OPAQUE), invalidatedRect(rect)
|
||||||
invalidatedRect(rect)
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void MainWindow::emptyTrash()
|
void MainWindow::emptyTrash()
|
||||||
{
|
{
|
||||||
for (auto window: trash) {
|
for (auto window : trash) {
|
||||||
delete window;
|
delete window;
|
||||||
}
|
}
|
||||||
trash.clear();
|
trash.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(HARDWARE_TOUCH)
|
|
||||||
void MainWindow::setTouchEnabled(bool enable)
|
|
||||||
{
|
|
||||||
switch(touchEnableState)
|
|
||||||
{
|
|
||||||
case TouchOn:
|
|
||||||
if(!enable)
|
|
||||||
touchEnableState = TouchOff;
|
|
||||||
break;
|
|
||||||
case TouchOn_Touching:
|
|
||||||
if(!enable)
|
|
||||||
touchEnableState = TouchOnToOff_Touching;
|
|
||||||
break;
|
|
||||||
case TouchOnToOff_Touching:
|
|
||||||
if(enable)
|
|
||||||
touchEnableState = TouchOn_Touching;
|
|
||||||
break;
|
|
||||||
case TouchOff:
|
|
||||||
if(enable)
|
|
||||||
touchEnableState = TouchOn;
|
|
||||||
break;
|
|
||||||
case TouchOff_Touching:
|
|
||||||
if(enable)
|
|
||||||
touchEnableState = TouchOffToOn_Touching;
|
|
||||||
break;
|
|
||||||
case TouchOffToOn_Touching:
|
|
||||||
if(!enable)
|
|
||||||
touchEnableState = TouchOff_Touching;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void MainWindow::invalidate(const rect_t & rect)
|
void MainWindow::invalidate(const rect_t& rect)
|
||||||
{
|
{
|
||||||
if (invalidatedRect.w) {
|
if (invalidatedRect.w) {
|
||||||
auto left = limit<coord_t>(0, rect.left(), invalidatedRect.left());
|
auto left = limit<coord_t>(0, rect.left(), invalidatedRect.left());
|
||||||
auto right = limit<coord_t>(invalidatedRect.right(), rect.right(), LCD_W);
|
auto right = limit<coord_t>(invalidatedRect.right(), rect.right(), LCD_W);
|
||||||
auto top = limit<coord_t>(0, rect.top(), invalidatedRect.top());
|
auto top = limit<coord_t>(0, rect.top(), invalidatedRect.top());
|
||||||
auto bottom = limit<coord_t>(rect.bottom(), invalidatedRect.bottom(), LCD_H);
|
auto bottom =
|
||||||
|
limit<coord_t>(rect.bottom(), invalidatedRect.bottom(), LCD_H);
|
||||||
invalidatedRect = {left, top, right - left, bottom - top};
|
invalidatedRect = {left, top, right - left, bottom - top};
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
invalidatedRect = rect;
|
invalidatedRect = rect;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -104,6 +65,7 @@ void MainWindow::run(bool trash)
|
|||||||
|
|
||||||
auto delta = ticksNow() - start;
|
auto delta = ticksNow() - start;
|
||||||
if (delta > 10 * SYSTEM_TICKS_1MS) {
|
if (delta > 10 * SYSTEM_TICKS_1MS) {
|
||||||
TRACE_WINDOWS("MainWindow::run took %dms", (ticksNow() - start) / SYSTEM_TICKS_1MS);
|
TRACE_WINDOWS("MainWindow::run took %dms",
|
||||||
|
(ticksNow() - start) / SYSTEM_TICKS_1MS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
-25
@@ -62,17 +62,6 @@ class MainWindow: public Window
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(HARDWARE_TOUCH)
|
|
||||||
void setTouchEnabled(bool enable);
|
|
||||||
bool touchEventOccured() {
|
|
||||||
if(_touchEventOccured)
|
|
||||||
{
|
|
||||||
_touchEventOccured = false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void setActiveScreen() {
|
void setActiveScreen() {
|
||||||
lv_scr_load(lvobj);
|
lv_scr_load(lvobj);
|
||||||
@@ -99,18 +88,4 @@ class MainWindow: public Window
|
|||||||
static void emptyTrash();
|
static void emptyTrash();
|
||||||
rect_t invalidatedRect;
|
rect_t invalidatedRect;
|
||||||
const char * shutdown = nullptr;
|
const char * shutdown = nullptr;
|
||||||
#if defined(HARDWARE_TOUCH)
|
|
||||||
bool lastTouchState = false;
|
|
||||||
bool _touchEventOccured = false;
|
|
||||||
|
|
||||||
enum TouchEnableState {
|
|
||||||
TouchOn,
|
|
||||||
TouchOn_Touching,
|
|
||||||
TouchOnToOff_Touching,
|
|
||||||
TouchOff,
|
|
||||||
TouchOff_Touching,
|
|
||||||
TouchOffToOn_Touching
|
|
||||||
};
|
|
||||||
TouchEnableState touchEnableState = TouchOn;
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user