Kaynağa Gözat

SINGLE_TOUCH_NAVIGATION Follow Up (#20213)

Victor Oliveira 4 yıl önce
ebeveyn
işleme
28e315cd69
No account linked to committer's email address

+ 2
- 1
Marlin/src/lcd/tft/touch.cpp Dosyayı Görüntüle

156
 
156
 
157
     case MENU_SCREEN: ui.goto_screen((screenFunc_t)control->data); break;
157
     case MENU_SCREEN: ui.goto_screen((screenFunc_t)control->data); break;
158
     case BACK: ui.goto_previous_screen(); break;
158
     case BACK: ui.goto_previous_screen(); break;
159
-    case CLICK:
159
+    case MENU_CLICK:
160
       TERN_(SINGLE_TOUCH_NAVIGATION, ui.encoderPosition = control->data);
160
       TERN_(SINGLE_TOUCH_NAVIGATION, ui.encoderPosition = control->data);
161
       ui.lcd_clicked = true;
161
       ui.lcd_clicked = true;
162
       break;
162
       break;
163
+    case CLICK: ui.lcd_clicked = true; break;
163
     #if HAS_RESUME_CONTINUE
164
     #if HAS_RESUME_CONTINUE
164
       case RESUME_CONTINUE: extern bool wait_for_user; wait_for_user = false; break;
165
       case RESUME_CONTINUE: extern bool wait_for_user; wait_for_user = false; break;
165
     #endif
166
     #endif

+ 1
- 0
Marlin/src/lcd/tft/touch.h Dosyayı Görüntüle

45
   PAGE_UP,
45
   PAGE_UP,
46
   PAGE_DOWN,
46
   PAGE_DOWN,
47
   CLICK,
47
   CLICK,
48
+  MENU_CLICK,
48
   RESUME_CONTINUE,
49
   RESUME_CONTINUE,
49
   SLIDER,
50
   SLIDER,
50
   INCREASE,
51
   INCREASE,

+ 1
- 1
Marlin/src/lcd/tft/ui_320x240.cpp Dosyayı Görüntüle

652
 
652
 
653
   menu_line(row, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
653
   menu_line(row, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
654
   #if ENABLED(TOUCH_SCREEN)
654
   #if ENABLED(TOUCH_SCREEN)
655
-    const TouchControlType tct = TERN(SINGLE_TOUCH_NAVIGATION, true, sel) ? CLICK : MENU_ITEM;
655
+    const TouchControlType tct = TERN(SINGLE_TOUCH_NAVIGATION, true, sel) ? MENU_CLICK : MENU_ITEM;
656
     touch.add_control(tct, 0, 2 + 34 * row, TFT_WIDTH, 32, encoderTopLine + row);
656
     touch.add_control(tct, 0, 2 + 34 * row, TFT_WIDTH, 32, encoderTopLine + row);
657
   #endif
657
   #endif
658
 }
658
 }

+ 1
- 1
Marlin/src/lcd/tft/ui_480x320.cpp Dosyayı Görüntüle

659
 
659
 
660
   menu_line(row, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
660
   menu_line(row, sel ? COLOR_SELECTION_BG : COLOR_BACKGROUND);
661
   #if ENABLED(TOUCH_SCREEN)
661
   #if ENABLED(TOUCH_SCREEN)
662
-    const TouchControlType tct = TERN(SINGLE_TOUCH_NAVIGATION, true, sel) ? CLICK : MENU_ITEM;
662
+    const TouchControlType tct = TERN(SINGLE_TOUCH_NAVIGATION, true, sel) ? MENU_CLICK : MENU_ITEM;
663
     touch.add_control(tct, 0, 4 + 45 * row, TFT_WIDTH, 43, encoderTopLine + row);
663
     touch.add_control(tct, 0, 4 + 45 * row, TFT_WIDTH, 43, encoderTopLine + row);
664
   #endif
664
   #endif
665
 }
665
 }

Loading…
İptal
Kaydet