From a35d6b6a058b9936b99f3f19b6abe4661d09a514 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 19 Nov 2016 13:07:06 +0100 Subject: [PATCH] 3djc/horus fix #4041 (#4042) * Reduce model name size until they fit into the buffer * SMLSIZE is better (but cut is still needed) * Rework screen layout to handle up to 15 chars * Allow for the two scroolbars (models and cats) --- .../Darkblue/modelsel/mask_iconback.png | Bin 1173 -> 1005 bytes .../THEMES/Default/modelsel/mask_iconback.png | Bin 1173 -> 1005 bytes radio/src/gui/480x272/model_select.cpp | 12 ++++++------ radio/src/storage/modelslist.h | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png b/radio/sdcard/horus/THEMES/Darkblue/modelsel/mask_iconback.png index e8a6c0b32c4a8b055e38bef9fb33dff6073b0900..3e853d3d5f1382ef6ce4a9599b83feba2b2be5ea 100644 GIT binary patch literal 1005 zcmeAS@N?(olHy`uVBq!ia0vp^wLl!f!3HF6Jp8c$NU|$VGuJUwo45_&FcCNLza-u}*`7jaBJy`;oM z)r>YvFm*2@y8o< zxDO^wSmyok=TFJw$B(Zm=d-%DyTdVDL&U(u#O1Oo@2R{P1CBp2G`X1_3Qt zzI-{v+)pe_j8jghe);z8Qi*1Wmgt-J?=P2R^6>F33ea%4UOG#!HE3na=FP@Xqn#EC z{GTyn#)p3gF0jh(j5+t&=6v#AZkZC9qNa@O?B>_I3>f}AdOG3Y z@#E}4D@A;#AN%sfq&{V`+t#Sm7ng3_yO*}td(q;>%icVcnz=g-M}mW(b+f);(v>(=Qp{JFY{W7Ewy=?{2fIijPZP5UF? zcNyE+_066=d)D)eT?-i9FSA~_bcyMBp+K)&<}Q(G)2ILEnzN8wx?oNDQAs&DH@o@k zf1VbbrI&D^R@A~bd`f}=$LUQ1{m1wJvGEO`uypCtdbV>HT6rz5?OvoZ*>lFSlji(W z(tegVUM@Lmz{9*OQ)#A8-EXT|>jZ#_>OU{c&=1g-oPci#J1y_lHTD?X@tR}U4Tikg}=zkgf$hBtiu`c)pNq4u2r|KnOf{?DI3 z<=LT*INy0RX+y5`!hnut-if)nYZo5K+||#1=j~hFW5Sv&iUE1XHqbO=U=*e zmlx=FzILGB!@|R7bIn=yd&26~+CF}MW~F?y-YKW0rOo1#VW?xS-Nce~`R2tLY@ M>FVdQ&MBb@0Gsj86951J literal 1173 zcmV;G1Zw+d$SXc>am@SqG&L;E7WS5n_=Ldl}bMKJi zaPA)@Dgn?y|Fx;9DV&^~)cqU@42uxX&dxACK3>-|Jb&o3&^Ncaxmou!*err*ZEZ!d zSVSlka{UZ8iy&TKU$MKpTh}uf7J+PRY}B=%$BSfWvRMT4^74Ycy**cZ85RM#9dvmN2}qJ8+}+)wzrVkxeQXv1X`1G0&}Fj- zDjJPKmSy<;e#d**EP{G|e#ZX(eocEA7J=0|=<*m6m?TNaX0u2plaAK2Sp=qO8n(8! z9It1y2rd?jp-?C|8g$t#f_r*;!ok6TqqPhRIUaO*3=zCuFLJpYdU|>+*Rfd$rBcb! zpvz_<06=$lHy$1y;PrY<*RWX#03gdU4i674*Dx$pW;f{a7@{(t&xb;xfX>d&s`uF} zRQCD#iS6xe)B9`|GU)B?MK+s-$5YuOY!))e<#ISWI;wh)VWA3UgD#IDst^bSpePC= zk%-|sn}sU8zrR-%WHLBDJ~muqSjg1xgD#IDG8GI4 zp(qMEIywNbS;)fM+Z%RvcFI4qS;*4J$OtYjE&#Au$j0U6B~DLI0Wd7&fIjH*7$RFu zO-(2ki|_*Y@vlD&eQzHhA4nt;Y!-56Vq$_b3prCNl^7OsW_^8~#}L_TX=y>RSY)%1 zy``lkG&eUhEMza8PM6XR-sZb~cRaMc})&_vT8zKvf zi;Lx;01OLR_&V4EJch``(9jUBudfZ)*eq1l*TGiDW}ylV4GmCL72$B$aGlLU6&4m2 zDuMzqEL6qsgRPFo5E=CK^&ykV7`}<9W3!M!DwV1l6oAb_U-0x&G}h1p=M<1s`4fOtHPd_K=VnoRc6>9l1~05%KZ*FSp5=ktii1qEQU2+ia1;Qsy|iA2KL`oH^e z=sTO8opl@(fMF4u)4^89V@Oc3SPYMkkB;XRfXyPT)z#ISf&#Evgd|B4ve_(>$z)CY z*en8?nVG3MC;-DEq*@1C9giWwL?RI=ih@8OQ1f0ki(pn(R$K)IV6zBCk|f;R++c8U z(A9o6i$JEQr(FjHU|59WcCgj)7!pK#dplHBMKBn2{R}pXAeNVx>k10MW)a5u`8h^M nN9%e9n?(SVlaqA^1ps~mi~N;_+4F`D00000NkvXXu0mjfazz9o diff --git a/radio/sdcard/horus/THEMES/Default/modelsel/mask_iconback.png b/radio/sdcard/horus/THEMES/Default/modelsel/mask_iconback.png index e8a6c0b32c4a8b055e38bef9fb33dff6073b0900..3e853d3d5f1382ef6ce4a9599b83feba2b2be5ea 100644 GIT binary patch literal 1005 zcmeAS@N?(olHy`uVBq!ia0vp^wLl!f!3HF6Jp8c$NU|$VGuJUwo45_&FcCNLza-u}*`7jaBJy`;oM z)r>YvFm*2@y8o< zxDO^wSmyok=TFJw$B(Zm=d-%DyTdVDL&U(u#O1Oo@2R{P1CBp2G`X1_3Qt zzI-{v+)pe_j8jghe);z8Qi*1Wmgt-J?=P2R^6>F33ea%4UOG#!HE3na=FP@Xqn#EC z{GTyn#)p3gF0jh(j5+t&=6v#AZkZC9qNa@O?B>_I3>f}AdOG3Y z@#E}4D@A;#AN%sfq&{V`+t#Sm7ng3_yO*}td(q;>%icVcnz=g-M}mW(b+f);(v>(=Qp{JFY{W7Ewy=?{2fIijPZP5UF? zcNyE+_066=d)D)eT?-i9FSA~_bcyMBp+K)&<}Q(G)2ILEnzN8wx?oNDQAs&DH@o@k zf1VbbrI&D^R@A~bd`f}=$LUQ1{m1wJvGEO`uypCtdbV>HT6rz5?OvoZ*>lFSlji(W z(tegVUM@Lmz{9*OQ)#A8-EXT|>jZ#_>OU{c&=1g-oPci#J1y_lHTD?X@tR}U4Tikg}=zkgf$hBtiu`c)pNq4u2r|KnOf{?DI3 z<=LT*INy0RX+y5`!hnut-if)nYZo5K+||#1=j~hFW5Sv&iUE1XHqbO=U=*e zmlx=FzILGB!@|R7bIn=yd&26~+CF}MW~F?y-YKW0rOo1#VW?xS-Nce~`R2tLY@ M>FVdQ&MBb@0Gsj86951J literal 1173 zcmV;G1Zw+d$SXc>am@SqG&L;E7WS5n_=Ldl}bMKJi zaPA)@Dgn?y|Fx;9DV&^~)cqU@42uxX&dxACK3>-|Jb&o3&^Ncaxmou!*err*ZEZ!d zSVSlka{UZ8iy&TKU$MKpTh}uf7J+PRY}B=%$BSfWvRMT4^74Ycy**cZ85RM#9dvmN2}qJ8+}+)wzrVkxeQXv1X`1G0&}Fj- zDjJPKmSy<;e#d**EP{G|e#ZX(eocEA7J=0|=<*m6m?TNaX0u2plaAK2Sp=qO8n(8! z9It1y2rd?jp-?C|8g$t#f_r*;!ok6TqqPhRIUaO*3=zCuFLJpYdU|>+*Rfd$rBcb! zpvz_<06=$lHy$1y;PrY<*RWX#03gdU4i674*Dx$pW;f{a7@{(t&xb;xfX>d&s`uF} zRQCD#iS6xe)B9`|GU)B?MK+s-$5YuOY!))e<#ISWI;wh)VWA3UgD#IDst^bSpePC= zk%-|sn}sU8zrR-%WHLBDJ~muqSjg1xgD#IDG8GI4 zp(qMEIywNbS;)fM+Z%RvcFI4qS;*4J$OtYjE&#Au$j0U6B~DLI0Wd7&fIjH*7$RFu zO-(2ki|_*Y@vlD&eQzHhA4nt;Y!-56Vq$_b3prCNl^7OsW_^8~#}L_TX=y>RSY)%1 zy``lkG&eUhEMza8PM6XR-sZb~cRaMc})&_vT8zKvf zi;Lx;01OLR_&V4EJch``(9jUBudfZ)*eq1l*TGiDW}ylV4GmCL72$B$aGlLU6&4m2 zDuMzqEL6qsgRPFo5E=CK^&ykV7`}<9W3!M!DwV1l6oAb_U-0x&G}h1p=M<1s`4fOtHPd_K=VnoRc6>9l1~05%KZ*FSp5=ktii1qEQU2+ia1;Qsy|iA2KL`oH^e z=sTO8opl@(fMF4u)4^89V@Oc3SPYMkkB;XRfXyPT)z#ISf&#Evgd|B4ve_(>$z)CY z*en8?nVG3MC;-DEq*@1C9giWwL?RI=ih@8OQ1f0ki(pn(R$K)IV6zBCk|f;R++c8U z(A9o6i$JEQr(FjHU|59WcCgj)7!pK#dplHBMKBn2{R}pXAeNVx>k10MW)a5u`8h^M nN9%e9n?(SVlaqA^1ps~mi~N;_+4F`D00000NkvXXu0mjfazz9o 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++) {