From 2db5eee03bf093faa0b0f13622a2b762d388e8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Wed, 24 Nov 2021 21:19:34 +0300 Subject: [PATCH] Gui: define status bar workarea, remove unused icon. (#841) * Gui: define status bar workarea, remove unused icon. * Format Sources --- applications/gui/gui.c | 5 +++-- applications/gui/gui_i.h | 1 + assets/icons/StatusBar/Background_128x8.png | Bin 374 -> 0 bytes 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 assets/icons/StatusBar/Background_128x8.png diff --git a/applications/gui/gui.c b/applications/gui/gui.c index f4c80602..f20718ca 100644 --- a/applications/gui/gui.c +++ b/applications/gui/gui.c @@ -86,7 +86,8 @@ void gui_redraw_status_bar(Gui* gui) { canvas_set_color(gui->canvas, ColorBlack); - canvas_frame_set(gui->canvas, x, GUI_STATUS_BAR_Y + 2, width, GUI_STATUS_BAR_HEIGHT); + canvas_frame_set( + gui->canvas, x, GUI_STATUS_BAR_Y + 2, width, GUI_STATUS_BAR_WORKAREA_HEIGHT); view_port_draw(view_port, gui->canvas); } @@ -125,7 +126,7 @@ void gui_redraw_status_bar(Gui* gui) { canvas_set_color(gui->canvas, ColorBlack); canvas_frame_set( - gui->canvas, x + 3, GUI_STATUS_BAR_Y + 2, width, GUI_STATUS_BAR_HEIGHT); + gui->canvas, x + 3, GUI_STATUS_BAR_Y + 2, width, GUI_STATUS_BAR_WORKAREA_HEIGHT); view_port_draw(view_port, gui->canvas); x += (width + 2); diff --git a/applications/gui/gui_i.h b/applications/gui/gui_i.h index fd54f290..d8e3983b 100644 --- a/applications/gui/gui_i.h +++ b/applications/gui/gui_i.h @@ -24,6 +24,7 @@ #define GUI_STATUS_BAR_Y 0 #define GUI_STATUS_BAR_WIDTH GUI_DISPLAY_WIDTH #define GUI_STATUS_BAR_HEIGHT 13 +#define GUI_STATUS_BAR_WORKAREA_HEIGHT 8 #define GUI_WINDOW_X 0 #define GUI_WINDOW_Y GUI_STATUS_BAR_HEIGHT diff --git a/assets/icons/StatusBar/Background_128x8.png b/assets/icons/StatusBar/Background_128x8.png deleted file mode 100644 index c71b5a9926da80478b8681bc3df29304709c657e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmeAS@N?(olHy`uVBq!ia0vp^4M5Dn#0(^THp{;SQY`6?zK#qG8~eHcB(ehe3dtTp zz6=aiYCyFu3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8U)v6XN>+Kaj-$BoE%! z`UGS#mIV0)GdMiEkp|)p1!W^Pnku9I3*bjXI2A+Vm)0PLnJP@ z_8amYP~c&1cKN1c`k&MJo5Ici|GgHzDVW^;<4MOyjw4S!CZ0H`5H;c1G%MrCnX(co zuOF4l>s=}3jy?6c-HLZ^<3xtum3i;i9Gqaw_EGO}F0=lLw`cjC$_#x?=KYQVTBKUy z8c~vxSdwa$T$Bo=7>o>z40R2Rb&U)|3@xk-EUkp9Z&;mdKI;Vst0G@(#EC2ui