iarv/Meck
1
0
Fork 1
mirror of https://github.com/pelgraine/Meck.git synced 2026-03-28 17:42:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

t5s3 - fix for del channel ui and touch function

Browse Source
This commit is contained in:
pelgraine
2026-03-20 23:20:20 +11:00
parent 17f8233402
commit a627fbe0e9
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/companion_radio/main.cpp
View File

@@ -1037,6 +1037,9 @@ static void lastHeardToggleContact() {
if (ss->isEditing()) {
return 0; // Consume — don't interfere with active edit mode
}
if (ss->isOnDeletableChannel()) {
return 'x'; // Long press on channel row → delete
}
}
return KEY_ENTER; // Not editing: toggle/edit selected row
}

19
examples/companion_radio/ui-new/Settingsscreen.h
View File

@@ -540,6 +540,13 @@ public:
bool isOnboarding() const { return _onboarding; }
bool isEditing() const { return _editMode != EDIT_NONE; }
bool hasRadioChanges() const { return _radioChanged; }
bool isOnChannelsSubScreen() const { return _subScreen == SUB_CHANNELS; }
bool isOnDeletableChannel() const {
return _subScreen == SUB_CHANNELS &&
_cursor >= 0 && _cursor < _numRows &&
_rows[_cursor].type == ROW_CHANNEL &&
_rows[_cursor].param > 0;
}
// Tap-to-select: given a virtual Y coordinate, compute which row was tapped
// and move cursor there. Returns: 0=miss, 1=moved to new row, 2=tapped current row.
@@ -1015,7 +1022,11 @@ public:
snprintf(tmp, sizeof(tmp), " %s", ch.name);
if (selected) {
// Show delete hint on right
const char* hint = "Del:X";
#if defined(LilyGo_T5S3_EPaper_Pro)
const char* hint = "Hold:Del";
#else
const char* hint = "X:Del";
#endif
int hintW = display.getTextWidth(hint);
display.setCursor(display.width() - hintW - 2, y);
display.print(hint);
@@ -1129,7 +1140,11 @@ public:
} else if (_confirmAction == 2) {
display.drawTextCentered(display.width() / 2, by + 4, "Apply radio changes?");
}
#if defined(LilyGo_T5S3_EPaper_Pro)
display.drawTextCentered(display.width() / 2, by + bh - 14, "Tap:Yes Boot:No");
#else
display.drawTextCentered(display.width() / 2, by + bh - 14, "Enter:Yes Q:No");
#endif
display.setTextSize(1);
}
@@ -1229,7 +1244,7 @@ public:
if (_editMode == EDIT_NONE) {
if (_subScreen != SUB_NONE) {
display.print("Boot:Back");
const char* r = "Tap:Toggle Hold:Edit";
const char* r = (_subScreen == SUB_CHANNELS) ? "Tap:Select Hold:Del" : "Tap:Toggle Hold:Edit";
display.setCursor(display.width() - display.getTextWidth(r) - 2, footerY);
display.print(r);
} else {