Skip to content

Commit 33c868d

Browse files
committed
fix long text labels clipped
1 parent c68c7bc commit 33c868d

2 files changed

Lines changed: 20 additions & 18 deletions

File tree

generated/ui_240x320/screens.c

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,8 @@ void create_screen_main_screen() {
559559
objects.home_mail_label = obj;
560560
lv_obj_set_pos(obj, 105, 50);
561561
lv_obj_set_size(obj, LV_PCT(80), LV_SIZE_CONTENT);
562-
lv_label_set_long_mode(obj, LV_LABEL_LONG_CLIP);
563562
lv_label_set_text(obj, _("no new messages"));
563+
lv_obj_set_style_text_line_space(obj, -4, LV_PART_MAIN | LV_STATE_DEFAULT);
564564
}
565565
{
566566
// HomeNodesButton
@@ -584,8 +584,8 @@ void create_screen_main_screen() {
584584
objects.home_nodes_label = obj;
585585
lv_obj_set_pos(obj, 105, 50);
586586
lv_obj_set_size(obj, LV_PCT(80), LV_SIZE_CONTENT);
587-
lv_label_set_long_mode(obj, LV_LABEL_LONG_CLIP);
588587
lv_label_set_text(obj, _("1 of 1 nodes online"));
588+
lv_obj_set_style_text_line_space(obj, -4, LV_PART_MAIN | LV_STATE_DEFAULT);
589589
}
590590
{
591591
// HomeTimeButton
@@ -2539,10 +2539,10 @@ void create_screen_main_screen() {
25392539
objects.top_nodes_online_label = obj;
25402540
lv_obj_set_pos(obj, 25, 0);
25412541
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2542-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
25432542
lv_label_set_text(obj, _("1 of 1 nodes online"));
25442543
lv_obj_set_style_text_font(obj, &ui_font_montserrat_16, LV_PART_MAIN | LV_STATE_DEFAULT);
25452544
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2545+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
25462546
}
25472547
{
25482548
// TopNodesImage
@@ -2576,10 +2576,10 @@ void create_screen_main_screen() {
25762576
objects.top_user_group_label = obj;
25772577
lv_obj_set_pos(obj, 25, 0);
25782578
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2579-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
25802579
lv_label_set_text(obj, _("Group Channels"));
25812580
lv_obj_set_style_text_font(obj, &ui_font_montserrat_16, LV_PART_MAIN | LV_STATE_DEFAULT);
25822581
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2582+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
25832583
}
25842584
{
25852585
// TopGroupImage
@@ -2613,10 +2613,10 @@ void create_screen_main_screen() {
26132613
objects.top_group_chat_label = obj;
26142614
lv_obj_set_pos(obj, 25, 0);
26152615
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2616-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
26172616
lv_label_set_text(obj, _("no messages"));
26182617
lv_obj_set_style_text_font(obj, &ui_font_montserrat_16, LV_PART_MAIN | LV_STATE_DEFAULT);
26192618
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2619+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
26202620
}
26212621
{
26222622
// TopGroupChatImage
@@ -2650,9 +2650,9 @@ void create_screen_main_screen() {
26502650
objects.top_basic_settings_label = obj;
26512651
lv_obj_set_pos(obj, 25, 0);
26522652
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2653-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
26542653
lv_label_set_text(obj, _("Settings & Tools"));
26552654
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2655+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
26562656
}
26572657
{
26582658
// TopBasicSettingsImage
@@ -2688,6 +2688,7 @@ void create_screen_main_screen() {
26882688
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
26892689
lv_label_set_text(obj, _("Settings (advanced)"));
26902690
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2691+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
26912692
}
26922693
{
26932694
// TopAdvancedSettingsImage
@@ -2721,9 +2722,9 @@ void create_screen_main_screen() {
27212722
objects.top_map_label = obj;
27222723
lv_obj_set_pos(obj, 25, 0);
27232724
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2724-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
27252725
lv_label_set_text(obj, _("Locations Map"));
27262726
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2727+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
27272728
}
27282729
{
27292730
// TopMapImage
@@ -2758,9 +2759,9 @@ void create_screen_main_screen() {
27582759
objects.top_chats_label = obj;
27592760
lv_obj_set_pos(obj, 25, 0);
27602761
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2761-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
27622762
lv_label_set_text(obj, _("no chats"));
27632763
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2764+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
27642765
}
27652766
{
27662767
// TopChatsImage
@@ -2795,9 +2796,9 @@ void create_screen_main_screen() {
27952796
objects.top_messages_node_label = obj;
27962797
lv_obj_set_pos(obj, 25, 0);
27972798
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2798-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
27992799
lv_label_set_text(obj, _("no messages"));
28002800
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2801+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
28012802
}
28022803
{
28032804
// TopMessagesNodeImage
@@ -2831,9 +2832,9 @@ void create_screen_main_screen() {
28312832
objects.top_node_search_label = obj;
28322833
lv_obj_set_pos(obj, 25, 0);
28332834
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2834-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
28352835
lv_label_set_text(obj, _("Node Search"));
28362836
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2837+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
28372838
}
28382839
{
28392840
// TopNodeSearchImage
@@ -2867,9 +2868,9 @@ void create_screen_main_screen() {
28672868
objects.top_mesh_detector_label = obj;
28682869
lv_obj_set_pos(obj, 25, 0);
28692870
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2870-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
28712871
lv_label_set_text(obj, _("Mesh Detector"));
28722872
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2873+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
28732874
}
28742875
{
28752876
// TopMeshDetectorImage
@@ -2904,9 +2905,9 @@ void create_screen_main_screen() {
29042905
objects.top_signal_scanner_label = obj;
29052906
lv_obj_set_pos(obj, 25, 0);
29062907
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2907-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
29082908
lv_label_set_text(obj, _("Signal Scanner"));
29092909
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2910+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
29102911
}
29112912
{
29122913
// TopSignalScannerImage
@@ -2940,9 +2941,9 @@ void create_screen_main_screen() {
29402941
objects.top_trace_route_label = obj;
29412942
lv_obj_set_pos(obj, 25, 0);
29422943
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2943-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
29442944
lv_label_set_text(obj, _("Trace Route"));
29452945
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2946+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
29462947
}
29472948
{
29482949
// TopTraceRouteImage
@@ -2976,9 +2977,9 @@ void create_screen_main_screen() {
29762977
objects.top_neighbors_label = obj;
29772978
lv_obj_set_pos(obj, 25, 0);
29782979
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
2979-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
29802980
lv_label_set_text(obj, _("Neighbors"));
29812981
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
2982+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
29822983
}
29832984
{
29842985
// TopNeighborsImage
@@ -3012,9 +3013,9 @@ void create_screen_main_screen() {
30123013
objects.top_statistics_label = obj;
30133014
lv_obj_set_pos(obj, 25, 0);
30143015
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
3015-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
30163016
lv_label_set_text(obj, _("Packet Statistics"));
30173017
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
3018+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
30183019
}
30193020
{
30203021
// TopStatisticsImage
@@ -3048,9 +3049,9 @@ void create_screen_main_screen() {
30483049
objects.top_packet_log_label = obj;
30493050
lv_obj_set_pos(obj, 25, 0);
30503051
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
3051-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
30523052
lv_label_set_text(obj, _("Packet Log"));
30533053
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
3054+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
30543055
}
30553056
{
30563057
// TopPacketLogImage
@@ -3085,9 +3086,9 @@ void create_screen_main_screen() {
30853086
objects.top_node_options_label = obj;
30863087
lv_obj_set_pos(obj, 25, 0);
30873088
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
3088-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
30893089
lv_label_set_text(obj, _("Node Options"));
30903090
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
3091+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
30913092
}
30923093
{
30933094
// TopNodeOptionsImage
@@ -6229,9 +6230,9 @@ void create_screen_main_screen() {
62296230
objects.top_setup_label = obj;
62306231
lv_obj_set_pos(obj, 25, 0);
62316232
lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
6232-
lv_label_set_long_mode(obj, LV_LABEL_LONG_SCROLL_CIRCULAR);
62336233
lv_label_set_text(obj, _("Please set region and name"));
62346234
lv_obj_set_style_align(obj, LV_ALIGN_LEFT_MID, LV_PART_MAIN | LV_STATE_DEFAULT);
6235+
lv_obj_set_style_max_width(obj, 160, LV_PART_MAIN | LV_STATE_DEFAULT);
62356236
}
62366237
{
62376238
// TopSetupImage

generated/ui_240x320/styles.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,7 @@ void init_style_top_panel_style_MAIN_DEFAULT(lv_style_t *style) {
735735
lv_style_set_text_color(style, lv_color_hex(0xff212121));
736736
lv_style_set_border_width(style, 0);
737737
lv_style_set_radius(style, 0);
738+
lv_style_set_text_line_space(style, -7);
738739
};
739740

740741
lv_style_t *get_style_top_panel_style_MAIN_DEFAULT() {

0 commit comments

Comments
 (0)