Sweetbread/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Issues Pull Requests Actions Activity

fix prior

Browse Source 
git-svn-id: svn://kolibrios.org@7978 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2020-05-24 16:51:53 +00:00
parent 25c205ad05
commit ad83141d5d
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
programs/cmm/lib/patterns/libimg_load_skin.h
View File

@ -10,7 +10,6 @@
void load_as24b(); void load_as24b();
void load(); void load();
void replace_color(); void replace_color();
void fill_transparent();
} skin; } skin;
:void libimg_image::load_as24b(dword file_path) :void libimg_image::load_as24b(dword file_path)
@ -50,17 +49,12 @@
for (i = imgsrc; i < max_i; i += 4) if (DSDWORD[i]==old_color) DSDWORD[i] = new_color; for (i = imgsrc; i < max_i; i += 4) if (DSDWORD[i]==old_color) DSDWORD[i] = new_color;
} }
:void libimg_image::fill_transparent(new_color)
{
if (new_color) replace_color(0, new_color);
}
:libimg_image icons32draw; :libimg_image icons32draw;
:void DrawIcon32(dword x,y, bg, icon_n) { :void DrawIcon32(dword x,y, bg, icon_n) {
//load_dll(libimg, #libimg_init,1); //load_dll(libimg, #libimg_init,1);
if (!icons32draw.image) { if (!icons32draw.image) {
icons32draw.load("/sys/icons32.png"); icons32draw.load("/sys/icons32.png");
icons32draw.fill_transparent(bg); icons32draw.replace_color(0x00000000, bg);
} }
if (icon_n>=0) img_draw stdcall(icons32draw.image, x, y, 32, 32, 0, icon_n*32); if (icon_n>=0) img_draw stdcall(icons32draw.image, x, y, 32, 32, 0, icon_n*32);
} }

2
programs/cmm/misc/mblocks.c
View File

@ -45,7 +45,7 @@ void main()
load_dll(libimg, #libimg_init,1); load_dll(libimg, #libimg_init,1);
skin.load("/sys/icons32.png"); skin.load("/sys/icons32.png");
skin.fill_transparent(COLOR_CELL_BG); skin.replace_color(0x00000000, COLOR_CELL_BG);
NewGame(); NewGame();

2
programs/cmm/misc/software_widget.c
View File

@ -152,7 +152,7 @@ void SetAppColors()
void LoadImages() void LoadImages()
{ {
skin.load("/sys/icons32.png"); skin.load("/sys/icons32.png");
skin.fill_transparent(swc.list_bg); skin.replace_color(0x00000000, swc.list_bg);
} }

2
programs/cmm/taskbar2/taskbar2.c
View File

@ -65,7 +65,7 @@ void main()
load_dll(libini, #lib_init,1); load_dll(libini, #lib_init,1);
skin.load("/sys/icons32.png"); skin.load("/sys/icons32.png");
skin.fill_transparent(COLOR_BG); skin.replace_color(0x00000000, COLOR_BG);
ini_get_int stdcall ("/sys/appicons.ini", "taskbar", "attachement", ATTACHEMENT_BOTTOM); ini_get_int stdcall ("/sys/appicons.ini", "taskbar", "attachement", ATTACHEMENT_BOTTOM);
attachement = EAX; attachement = EAX;