@@ -61,14 +61,17 @@ void hex_viewer_startscreen_draw(Canvas* canvas, HexViewerStartscreenModel* mode
6161 width ,
6262 0 ,
6363 ROW_HEIGHT * HEX_VIEWER_LINES_ON_SCREEN ,
64- first_line_on_screen , // TODO
64+ first_line_on_screen ,
6565 line_count - (HEX_VIEWER_LINES_ON_SCREEN - 1 ));
6666 }
6767
6868 char temp_buf [32 ];
6969 uint32_t row_iters = model -> file_read_bytes / HEX_VIEWER_BYTES_PER_LINE ;
7070 if (model -> file_read_bytes % HEX_VIEWER_BYTES_PER_LINE != 0 ) row_iters += 1 ;
7171
72+ // For the rest of drawing.
73+ canvas_set_font (canvas , FontKeyboard );
74+
7275 for (uint32_t i = 0 ; i < row_iters ; ++ i ) {
7376 uint32_t bytes_left_per_row = model -> file_read_bytes - i * HEX_VIEWER_BYTES_PER_LINE ;
7477 bytes_left_per_row = MIN (bytes_left_per_row , HEX_VIEWER_BYTES_PER_LINE );
@@ -79,21 +82,21 @@ void hex_viewer_startscreen_draw(Canvas* canvas, HexViewerStartscreenModel* mode
7982 for (uint32_t j = 0 ; j < bytes_left_per_row ; ++ j )
8083 if (!isprint ((int )temp_buf [j ])) temp_buf [j ] = '.' ;
8184
82- canvas_set_font (canvas , FontKeyboard );
85+ // canvas_set_font(canvas, FontKeyboard);
8386 canvas_draw_str (canvas , LEFT_OFFSET , TOP_OFFSET + i * ROW_HEIGHT , temp_buf );
8487 } else {
8588 uint32_t addr = model -> file_offset + i * HEX_VIEWER_BYTES_PER_LINE ;
8689 snprintf (temp_buf , 32 , "%04lX" , addr );
8790
88- canvas_set_font (canvas , FontKeyboard );
91+ // canvas_set_font(canvas, FontKeyboard);
8992 canvas_draw_str (canvas , LEFT_OFFSET , TOP_OFFSET + i * ROW_HEIGHT , temp_buf );
9093 }
9194
9295 char * p = temp_buf ;
9396 for (uint32_t j = 0 ; j < bytes_left_per_row ; ++ j )
9497 p += snprintf (p , 32 , "%02X " , model -> file_bytes [i ][j ]);
9598
96- canvas_set_font (canvas , FontKeyboard );
99+ // canvas_set_font(canvas, FontKeyboard);
97100 canvas_draw_str (canvas , LEFT_OFFSET + 41 , TOP_OFFSET + i * ROW_HEIGHT , temp_buf );
98101 }
99102
@@ -125,7 +128,7 @@ bool hex_viewer_startscreen_input(InputEvent* event, void* context) {
125128 furi_assert (context );
126129 HexViewerStartscreen * instance = context ;
127130 HexViewer * app = instance -> context ; // TO so good, but works
128- // TODO InputTypeShort?
131+
129132 if (event -> type == InputTypeRelease || event -> type == InputTypeRepeat ) {
130133 switch (event -> key ) {
131134 case InputKeyBack :
0 commit comments