Skip to content

Commit 1769924

Browse files
committed
fix: device name scroll in status bar
1 parent 8e39688 commit 1769924

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

main/gui.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,9 +187,6 @@ static void make_status_bar(void)
187187
JADE_ASSERT(name_alignment != GUI_ALIGN_CENTER);
188188
gui_make_text_font(&status_bar.title, "Jade", TFT_WHITE, GUI_TITLE_FONT);
189189
gui_set_align(status_bar.title, name_alignment, GUI_ALIGN_MIDDLE);
190-
#if HOME_SCREEN_DEEP_STATUS_BAR && (CONFIG_DISPLAY_WIDTH <= 280)
191-
gui_set_text_scroll(status_bar.title, TFT_BLACK);
192-
#endif
193190
gui_set_parent(status_bar.title, name_parent);
194191

195192
// Status bar data fields for tracking updates
@@ -2619,3 +2616,5 @@ gui_activity_t* gui_display_splash(void)
26192616
gui_set_current_activity(act);
26202617
return act;
26212618
}
2619+
2620+
gui_view_node_t* gui_status_bar_title(void) { return status_bar.title; }

main/gui.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ void gui_set_activity_title(gui_activity_t* activity, const char* title);
461461

462462
gui_activity_t* gui_current_activity(void);
463463
gui_activity_t* gui_display_splash(void);
464+
gui_view_node_t* gui_status_bar_title(void);
464465

465466
void gui_wheel_click(void);
466467
void gui_front_click(void);

main/ui/dashboard.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ gui_activity_t* make_home_screen_activity(const char* device_name, const char* f
6767
gui_make_activity_ex(&act, true, device_name, false);
6868
JADE_ASSERT(act);
6969

70+
#if HOME_SCREEN_DEEP_STATUS_BAR && (CONFIG_DISPLAY_WIDTH <= 280)
71+
gui_view_node_t* status_bar_title = gui_status_bar_title();
72+
status_bar_title->activity = act;
73+
gui_set_text_scroll(status_bar_title, TFT_BLACK);
74+
#endif
75+
7076
gui_view_node_t* node;
7177
gui_view_node_t* hsplit;
7278

0 commit comments

Comments
 (0)