melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SINGLE_TOUCH_NAVIGATION Follow Up (#20213)

Browse Source
This commit is contained in:
Victor Oliveira 2020-11-20 10:46:18 -03:00 committed by GitHub
parent 0e3d86579b
commit 28e315cd69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Marlin/src/lcd/tft/touch.cpp
View File

@ -156,10 +156,11 @@ void Touch::touch(touch_control_t *control) {
case MENU_SCREEN: ui.goto_screen((screenFunc_t)control->data); break; case MENU_SCREEN: ui.goto_screen((screenFunc_t)control->data); break;
case BACK: ui.goto_previous_screen(); break; case BACK: ui.goto_previous_screen(); break;
case CLICK: case MENU_CLICK:
TERN_(SINGLE_TOUCH_NAVIGATION, ui.encoderPosition = control->data); TERN_(SINGLE_TOUCH_NAVIGATION, ui.encoderPosition = control->data);
ui.lcd_clicked = true; ui.lcd_clicked = true;
break; break;
case CLICK: ui.lcd_clicked = true; break;
#if HAS_RESUME_CONTINUE #if HAS_RESUME_CONTINUE
case RESUME_CONTINUE: extern bool wait_for_user; wait_for_user = false; break; case RESUME_CONTINUE: extern bool wait_for_user; wait_for_user = false; break;
#endif #endif

1
Marlin/src/lcd/tft/touch.h
View File

@ -45,6 +45,7 @@ enum TouchControlType : uint16_t {
PAGE_UP, PAGE_UP,
PAGE_DOWN, PAGE_DOWN,
CLICK, CLICK,
MENU_CLICK,
RESUME_CONTINUE, RESUME_CONTINUE,
SLIDER, SLIDER,
INCREASE, INCREASE,

2
Marlin/src/lcd/tft/ui_320x240.cpp
View File

@ -652,7 +652,7 @@ void menu_item(const uint8_t row, bool sel ) {
menu_line(row, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND); menu_line(row, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
#if ENABLED(TOUCH_SCREEN) #if ENABLED(TOUCH_SCREEN)
const TouchControlType tct = TERN(SINGLE_TOUCH_NAVIGATION, true, sel) ? CLICK : MENU_ITEM; const TouchControlType tct = TERN(SINGLE_TOUCH_NAVIGATION, true, sel) ? MENU_CLICK : MENU_ITEM;
touch.add_control(tct, 0, 2 + 34 * row, TFT_WIDTH, 32, encoderTopLine + row); touch.add_control(tct, 0, 2 + 34 * row, TFT_WIDTH, 32, encoderTopLine + row);
#endif #endif
} }

2
Marlin/src/lcd/tft/ui_480x320.cpp
View File

@ -659,7 +659,7 @@ void menu_item(const uint8_t row, bool sel ) {
menu_line(row, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND); menu_line(row, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
#if ENABLED(TOUCH_SCREEN) #if ENABLED(TOUCH_SCREEN)
const TouchControlType tct = TERN(SINGLE_TOUCH_NAVIGATION, true, sel) ? CLICK : MENU_ITEM; const TouchControlType tct = TERN(SINGLE_TOUCH_NAVIGATION, true, sel) ? MENU_CLICK : MENU_ITEM;
touch.add_control(tct, 0, 4 + 45 * row, TFT_WIDTH, 43, encoderTopLine + row); touch.add_control(tct, 0, 4 + 45 * row, TFT_WIDTH, 43, encoderTopLine + row);
#endif #endif
} }