From 85139c507e2e41795970230a8863fff0835f5330 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Tue, 1 Nov 2016 17:11:54 +0000 Subject: [PATCH] Blueberries update, cmm dui fixes for dark skins git-svn-id: svn://kolibrios.org@6649 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 2 +- programs/cmm/eolite/include/gui.h | 4 ++-- programs/cmm/lib/gui.h | 10 +++++----- skins/Leency/Blueberries/center2.bmp | Bin 150 -> 150 bytes skins/Leency/Blueberries/default.asm | 8 ++++---- skins/Leency/Blueberries/default.dtp | Bin 40 -> 40 bytes skins/Leency/Blueberries/default.dtp.asm | 16 ++++++++-------- skins/Leency/Blueberries/left2.bmp | Bin 150 -> 246 bytes skins/Leency/Blueberries/right2.bmp | Bin 4566 -> 4566 bytes 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 41bc310a37..4eed21c879 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -574,7 +574,7 @@ void DrawStatusBar() int go_up_folder_exists=0; if (!show_status_bar) return; if (files.count>0) && (strcmp(file_mas[0]*304+buf+72,"..")==0) go_up_folder_exists=1; - DrawBar(1, Form.cheight - status_bar_h-1, Form.cwidth-2, status_bar_h, system.color.work); + DrawBar(1, Form.cheight - status_bar_h-1, Form.cwidth-2, status_bar_h, col_work); sprintf(#status_bar_str, STATUS_STR, files.count-go_up_folder_exists, count_dir-go_up_folder_exists, files.count-count_dir, selected_count); WriteText(6,Form.cheight - 13,0x80,0x000000,#status_bar_str); } diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h index b277a62d97..3be0f55948 100644 --- a/programs/cmm/eolite/include/gui.h +++ b/programs/cmm/eolite/include/gui.h @@ -50,11 +50,11 @@ void DrawFlatButton(dword x,y,width,height,id,text) DrawFilledBar(x+2, y+2, width-3, height-3); if (id) DefineButton(x+1,y+1,width-2,height-2,id+BT_HIDE,0xEFEBEF); if (height<18) { - WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,MixColors(system.color.work_text,0xFFFfff,210),text); + WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,0x333333,text); } else { DrawRectangle3D(x-1,y-1,width+2,height+2,system.color.work,MixColors(system.color.work,col_graph,200)); - WriteText(-strlen(text)*8+width/2+x+1,height/2+y-6,0x90,MixColors(system.color.work_text,0xFFFfff,210),text); + WriteText(-strlen(text)*8+width/2+x+1,height/2+y-6,0x90,0x333333,text); } } diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h index 32f989bdc9..195ebc229c 100644 --- a/programs/cmm/lib/gui.h +++ b/programs/cmm/lib/gui.h @@ -153,7 +153,7 @@ DrawRectangle(x, y, VALUE_FIELD_W, SIZE, system.color.work_graph); DrawRectangle3D(x+1, y+1, VALUE_FIELD_W-2, SIZE-2, 0xDDDddd, 0xffffff); DrawBar(x+2, y+2, VALUE_FIELD_W-3, SIZE-3, 0xffffff); - WriteText( -strlen(value_text)+3*8 + x+6, SIZE / 2 + y -6, 0x90, system.color.work_text, value_text); + WriteText( -strlen(value_text)+3*8 + x+6, SIZE / 2 + y -6, 0x90, 0x333333, value_text); DrawCaptButton(VALUE_FIELD_W + x, y, SIZE, SIZE, bt_id_more, system.color.work_button, system.color.work_button_text, "+"); DrawCaptButton(VALUE_FIELD_W + x + SIZE, y, SIZE, SIZE, bt_id_less, system.color.work_button, system.color.work_button_text, "-"); @@ -171,10 +171,10 @@ w = ESI.edit_box.width+1; if (ESI.edit_box.flags & 100000000000b) bg = 0xCACACA; else bg = 0xFFFfff; h = 15; - DrawRectangle(x-1, y-1, w+2, h+2, bg); - DrawRectangle3D(x-2, y-2, w+2, h+2, 0xDDDddd, bg); - DrawRectangle(x-3, y-3, w+6, h+6, system.color.work_graph); - DrawRectangle3D(x-4, y-4, w+8, h+8, system.color.work_dark, system.color.work_light); + DrawRectangle(x-1, y-1, w+1, h+1, bg); + DrawRectangle3D(x-2, y-2, w+3, h+3, 0xDDDddd, bg); + DrawRectangle(x-3, y-3, w+5, h+5, system.color.work_graph); + DrawRectangle3D(x-4, y-4, w+7, h+7, system.color.work_dark, system.color.work_light); edit_box_draw stdcall (edit_box_pointer); } diff --git a/skins/Leency/Blueberries/center2.bmp b/skins/Leency/Blueberries/center2.bmp index f11317edc6c50162afe14985cc4df5676390cacf..8ae114eac9aaae9f190f71c4c9fdaadcc68d61ac 100644 GIT binary patch delta 103 zcmbQnIE`_FS%QX|5`%|}Js5krIWTy;IWl;=J2LoqI5GHoI5YTpx-bNIyD|j&xG@C# zc`$?ocrt_rcrk%MQUn6b9g*r?9q=#zvyk>P693@1{iEqakS%Ru;AvHXh7VSvxa!PV&!p=06_) z;5Ry!*Xz)~e$cm^g#_ya)V= beXUC%^hdW#1tgJszg>Vd@?Ot}lvdyig3~H# literal 150 lcmZ?royGtGW{KmZJoBcv(t-h_8;tf-?y>4VICX2n4Ayyxvt;!yS{w5A3Va7 zeg7swy>{Wa4Q~$KZ{ht0btDMS`Z`L9*S2@w-imC0?_Giryuy(({HQmMhoGj8^ zBH$(v^Y{L5Nl0RlFXB<|Qb7)o@VP+Br^b0)NqW$kiDQ~+*iJ_AUq}jaWTITw?i~an z73Kh(ZecEaFKZ_|Ye)KUSUYmqySUk4XZD`V1R_e5$AKqoWn#GFp27LYRe-ognQ#59 z!P-!7Z8-dT)YVvD;ZtlsU^edAzRm0Dv({ny`k6@%hiWW(om$N2Kv*ux%O>4%{&7W= zGO?qltHa)Uy8TQ0sgtiudt1v3Z0&6}gdDThON6{o=#u?Z^MA`^ICR**veq9K@z@Yn zNcfbyT$~4YxtM=5GTz(O;pjQNdC;G7i?g?*wYd@QlQ$zho%YQKZqVs=bhb7(3Aii> z7f1!T6$zq1%9o3II8IJR96g==?%s^h+G>OQ44HY_*_(k_(!JFt61Be z{FraR&FIJU;(*iM-Uj!%+3A#-=z${wYY)}nl=Qi}>uNv26vgB;xH>*UCQ>QHi;H)#b;#e(V9-Ah z3=D(N)mI1xhOS=r5Bj}~erh^^M-=XN@6I6;39sVCE}D}kZDz9(e9>|uRnE&YWTsTW zg|Jqc&&k?J5XH)Th-(TZvAcJM{R3AD=wjWTIzg9`AF2(1UAH*_2 zJQ^K?`?F`iBXemfwoW{@6kmA3JeFdyg?MZ}9$zF$4CpCcL6HK@;qYaHR=M9)T3u-n z3v&pfxyjmMJ9@nF$n&+e46^p;A8_AX;9t+z5^Ut~4U5xbqUc0+%k_dpBN)fyCJnh(f|a{Sko#5s^c}nFWUhYvh;!ckus@ z{rsDe>9CoJ0pEnC{n~lIr=7OLtJm|VO6vvXbAB)RJ>&O8mrBL|^b<0AbF)(F!)=Nc zSL)+!O0$2yO=-k&cgc*8yz46Fl4kxr*0kw`Qem2^~S`VA)D>2x53 zQ-C!)TN3qpJzB%zkY$yZ;w}m9_xpQ~2wKM%3I)(GoX_Xh0mWi5o6X|4+wEjUw%aXD zf^@l4OC1x~FoaWpsVntetKaX_qMxzyQrsoM<#M@NttgG8X&q1gOeTZjY&NqFz&w}B zt=DUKe`!%U91aBCc}*P?VTV(IHTw@OUM?-lN~Iz%<*ejlh3HHK&xV;MJ3-j}3>gX9 zX0w4BQK4xbKdWG32nE>2&Kr@51uQv-!hXTfaU8Q1snGOGiiwS#^NZw-&|j<7WMTnJ zwmj_9>C|dSMz-+jbYjJ!MpS4Lq|2Kc6Jdw*H?F>Ol#;(NqtS>||BM|vUJSg)ZA zQK3oD3r@ta!zsXe&u|5!@pvrkOi4NemYfV(cRxeooIoUrq<&$rtUH_nY-7hsIs=v* zJYm0J$X6FhB6r=J8j~wy_cHoL{&RM2es)|alKnoJOhR$PM82MX?{}^-5!;i`AmT$F YP?$)n#bObbAwF_|46RZGZd6J=01%t%(f|Me