diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png index e8a6c0b32..3e853d3d5 100644 Binary files a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png and b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png differ diff --git a/radio/sdcard/horus/THEMES/Default/modelsel/mask_iconback.png b/radio/sdcard/horus/THEMES/Default/modelsel/mask_iconback.png index e8a6c0b32..3e853d3d5 100644 Binary files a/radio/sdcard/horus/THEMES/Default/modelsel/mask_iconback.png and b/radio/sdcard/horus/THEMES/Default/modelsel/mask_iconback.png differ diff --git a/radio/src/gui/480x272/model_select.cpp b/radio/src/gui/480x272/model_select.cpp index 3255da5f7..9a90ae95b 100644 --- a/radio/src/gui/480x272/model_select.cpp +++ b/radio/src/gui/480x272/model_select.cpp @@ -22,8 +22,8 @@ #include "storage/modelslist.h" #define CATEGORIES_WIDTH 127 -#define MODELS_LEFT 147 -#define MODELS_COLUMN_WIDTH 162 +#define MODELS_LEFT 127 +#define MODELS_COLUMN_WIDTH 170 enum ModelSelectMode { MODE_SELECT_MODEL, @@ -471,7 +471,7 @@ bool menuModelSelect(event_t event) } if (selected) { lcd->drawBitmap(5, LCD_H-FH, modelselModelNameBitmap); - lcdDrawText(22, LCD_H-FH-1, (*it)->name, TEXT_COLOR); + lcdDrawText(22, LCD_H-FH-1, (*it)->name, SMLSIZE|TEXT_COLOR); } } } @@ -498,9 +498,9 @@ bool menuModelSelect(event_t event) // Footer lcd->drawBitmap(5, LCD_H-FH-20, modelselSdFreeBitmap); uint32_t size = sdGetSize() / 100; - lcdDrawNumber(22, LCD_H-FH-21, size, PREC1, 0, NULL, "GB"); - lcd->drawBitmap(80, LCD_H-FH-20, modelselModelQtyBitmap); - lcdDrawNumber(105, LCD_H-FH-21, modelslist.modelsCount); + lcdDrawNumber(22, LCD_H-FH-21, size, PREC1|SMLSIZE, 0, NULL, "GB"); + lcd->drawBitmap(70, LCD_H-FH-20, modelselModelQtyBitmap); + lcdDrawNumber(92, LCD_H-FH-21, modelslist.modelsCount,SMLSIZE); return true; } diff --git a/radio/src/storage/modelslist.h b/radio/src/storage/modelslist.h index 3dd25054b..925e8e33e 100644 --- a/radio/src/storage/modelslist.h +++ b/radio/src/storage/modelslist.h @@ -24,7 +24,7 @@ #include #include "sdcard.h" -#define MODELCELL_WIDTH 151 +#define MODELCELL_WIDTH 166 #define MODELCELL_HEIGHT 59 class ModelCell @@ -63,7 +63,7 @@ class ModelCell } else { char timer[LEN_TIMER_STRING]; - buffer->drawSizedText(5, 2, header.name, LEN_MODEL_NAME, ZCHAR|TEXT_COLOR); + buffer->drawSizedText(1, 2, header.name, LEN_MODEL_NAME, SMLSIZE|ZCHAR|TEXT_COLOR); getTimerString(timer, 0); buffer->drawText(101, 40, timer, TEXT_COLOR); for (int i=0; i<4; i++) {