dandri/wadamesh
1
0
Fork 0
mirror of https://github.com/ALLFATHER-BV/wadamesh.git synced 2026-09-30 00:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/pr/492' into integration/all-open-prs-20260913

Browse Source 
# Conflicts:
#	src/ui-touch/UITask.cpp
This commit is contained in:
Michael A. Cojocari
2026-09-13 18:57:44 -04:00
parent 7639363c78 bd46b798eb
commit f060bbee09
2 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
THINKNODE_M9_SHORTCUTS.md
+4
View File
@@ -71,6 +71,10 @@ field, so you're never stuck. Enter sends (toggleable under Settings), Back
leaves the field. In the Terminal, Enter runs the command; in the text editor
it inserts a newline.
While a chat message is focused and newer messages are below it, a down arrow
appears at the right edge. Press **Right** to select it, then **OK** to jump to
the newest message.
Channels, direct messages, and room conversations place **#** and emoji to the
right of the message input. Press Right to move from the input to **#**, and
Right again to move to emoji. Press **OK** on either button to open its picker.
src/ui-touch/UITask.cpp
+38 -6
View File
@@ -5966,6 +5966,12 @@ static lv_obj_t* s_chat_unread_badge = nullptr; // red unread-count badge over
#if defined(HAS_THINKNODE_M9)
static lv_obj_t* s_m9_mail_indicator = nullptr;
static lv_obj_t* s_m9_contact_indicator = nullptr;
static void hideM9NoticeIndicators() {
if (s_m9_mail_indicator && lv_obj_is_valid(s_m9_mail_indicator))
lv_obj_add_flag(s_m9_mail_indicator, LV_OBJ_FLAG_HIDDEN);
if (s_m9_contact_indicator && lv_obj_is_valid(s_m9_contact_indicator))
lv_obj_add_flag(s_m9_contact_indicator, LV_OBJ_FLAG_HIDDEN);
}
#endif
static lv_obj_t* s_tab_indicator = nullptr; // thin rounded accent glow bar under the active tab
static lv_obj_t* s_update_subtab_badge = nullptr;// red dot over the "About" sub-tab button
@@ -7213,6 +7219,9 @@ static void showKb(LvChatPanel* p) {
}
static void focusChatComposerOnOpen(LvChatPanel* p) {
#if defined(HAS_THINKNODE_M9)
hideM9NoticeIndicators();
#endif
if (p && p->composer_ta && lv_obj_is_valid(p->composer_ta)) {
taClearSelection(p->composer_ta);
lv_textarea_set_cursor_pos(p->composer_ta, LV_TEXTAREA_CURSOR_LAST);
@@ -8025,7 +8034,8 @@ static void closeChatPanel(LvChatPanel* p) {
#if defined(HAS_M9_KEYBOARD)
if (s_m9_focus_pending == p->composer_ta ||
s_m9_focus_pending == p->symbol_btn ||
s_m9_focus_pending == p->emoji_btn) s_m9_focus_pending = nullptr;
s_m9_focus_pending == p->emoji_btn ||
s_m9_focus_pending == p->jump_btn) s_m9_focus_pending = nullptr;
#endif
hideKb();
if (p->overlay) lv_obj_add_flag(p->overlay, LV_OBJ_FLAG_HIDDEN);
@@ -9409,6 +9419,9 @@ static void tabChangedCb(lv_event_t* e) {
closeMentionsScreen(); // transient overlay — switching tabs leaves it
const int new_t = getActiveTab();
#if defined(HAS_THINKNODE_M9)
if (new_t == CHAT_INBOX_TAB_INDEX) hideM9NoticeIndicators();
#endif
updateTabIndicator(); // slide the accent glow bar under the newly-active tab
#if CAP_KEYPAD_NAV
if (new_t == CHAT_INBOX_TAB_INDEX && s_lv_tab_prev != CHAT_INBOX_TAB_INDEX) {
@@ -34371,8 +34384,9 @@ static void makeChatDetail(LvChatPanel& p) {
// only the glyph is visible; UITask::loop dims them to 50% one second after
// the last scroll (jumpBtnsSetDim above).
// These are pointer affordances on touch boards and hardware F-key affordances
// on Tanmatsu. They have no purpose on the T-LoRa Pager or ThinkNode M9, so skip creating them
// and leave the pointers null like every consumer already handles safely
// on Tanmatsu. M9 also uses the latest-message arrow as a d-pad focus target;
// the T-LoRa Pager keeps its Backspace shortcut instead. Leave omitted pointers
// null like every consumer already handles safely
// (chatUpdateJumpButtons, jumpBtnsSetDim, the LvChatPanel reset — all
// null-guarded). The pager's own Backspace-tap "jump to latest" shortcut
// below no longer depends on jump_btn's existence; it checks
@@ -34409,7 +34423,7 @@ static void makeChatDetail(LvChatPanel& p) {
lv_obj_add_flag(p.jump_oldest_btn, LV_OBJ_FLAG_HIDDEN);
#endif // Pager/M9 omit jump_oldest_btn
#if !defined(TLORA_PAGER) && !defined(HAS_THINKNODE_M9)
#if !defined(TLORA_PAGER)
p.jump_btn = lv_btn_create(p.overlay);
lv_obj_set_size(p.jump_btn, 28, 36);
lv_obj_set_style_bg_opa(p.jump_btn, LV_OPA_TRANSP, LV_PART_MAIN);
@@ -34435,7 +34449,7 @@ static void makeChatDetail(LvChatPanel& p) {
#endif
lv_obj_add_event_cb(p.jump_btn, jumpToLatestCb, LV_EVENT_CLICKED, &p);
lv_obj_add_flag(p.jump_btn, LV_OBJ_FLAG_HIDDEN);
#endif // Pager/M9 omit jump_btn
#endif // Pager omits jump_btn
// ---- Composer row ----
const lv_coord_t composer_h = chatComposerBaseH();
@@ -42031,6 +42045,23 @@ static bool m9HandleArrowKey(int key, lv_obj_t* ta) {
return true;
}
}
if (LvChatPanel* chat = navOpenChatPanel();
chat && chat->msgs && chat->jump_btn && lv_obj_is_valid(chat->jump_btn) &&
!lv_obj_has_flag(chat->jump_btn, LV_OBJ_FLAG_HIDDEN)) {
lv_obj_t* focused = s_nav_group ? lv_group_get_focused(s_nav_group) : nullptr;
if (focused && lv_obj_get_parent(focused) == chat->msgs) {
if (lv_obj_get_group(chat->jump_btn) == s_nav_group) {
s_nav_show = true;
lv_group_focus_obj(chat->jump_btn);
} else {
s_m9_focus_pending = chat->jump_btn;
navMarkDirty();
navMaybeRebuild();
}
if (g_lv.task) g_lv.task->noteUserInput();
return true;
}
}
lv_obj_t* source_ta = navFocusedTextarea();
lv_obj_t* button = m9SymbolButtonForField(source_ta);
if (!button && ta) button = m9SymbolButtonForField(ta);
@@ -59231,7 +59262,8 @@ void UITask::loop() {
navTopFrontmostChild(top) == s_appdrawer_root;
const bool notice_surface = !_screen_off && !_manual_lock && !s_remote_mode &&
!s_setup_root && !s_settings_sheet &&
!s_apppage_title && !s_chat_title[0] &&
!s_apppage_title && !hasChatDetailOpen() &&
getActiveTab() != CHAT_INBOX_TAB_INDEX &&
(!anyPopupOpen() || drawer_front);
const bool mail_pending = notice_surface && !drawer_front && getUnreadTotal() > 0;
const bool contact_pending = notice_surface && discoveredCount() > 0;