Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5996 → Rev 5997

/programs/cmm/lib/font.h
24,7 → 24,7
__SIZE size;
int width,height;
byte bold,italic,smooth;
dword color;
dword color, background;
dword font,font_begin;
word block;
byte init();
215,28 → 215,28
to = size.height - 1 * line_w + raw - 3;
for(i=raw; i < to; i+=3)
{
IF(i-raw%line_w +3 == line_w) continue;
IF(b24(i)==0x000000) && (b24(i+3)!=0x000000) && (b24(i+line_w)!=0x000000) && (b24(i+3+line_w)==0x000000)
if(i-raw%line_w +3 == line_w) continue;
if(b24(i)==0x000000) && (b24(i+3)!=0x000000) && (b24(i+line_w)!=0x000000) && (b24(i+3+line_w)==0x000000)
{
ShadowPixel(i+3, 2);
ShadowPixel(i+line_w, 2);
ShadowImage(i+3, 1, 1, 2);
ShadowImage(i+line_w, 1, 1, 2);
}
ELSE IF(b24(i)!=0x000000) && (b24(i+3)==0x000000) && (b24(i+line_w)==0x000000) && (b24(i+3+line_w)!=0x000000)
else if(b24(i)!=0x000000) && (b24(i+3)==0x000000) && (b24(i+line_w)==0x000000) && (b24(i+3+line_w)!=0x000000)
{
ShadowPixel(i, 2);
ShadowPixel(i+3+line_w, 2);
ShadowImage(i, 1, 1, 2);
ShadowImage(i+3+line_w, 1, 1, 2);
}
}
}
 
:int LABEL::write_center(dword x,y,w,h; dword background, color1; byte fontSizePoints; dword txt)
:int LABEL::write_center(dword x,y,w,h; dword _background, _color; byte fontSizePoints; dword txt)
{
size.pt = fontSizePoints;
getsize(txt);
return write(w-size.width/2+x,y, background, color1, fontSizePoints, txt);
return write(w-size.width/2+x,y, _background, _color, fontSizePoints, txt);
}
 
:int LABEL::write(int x,y; dword background, color1; byte fontSizePoints; dword text1)
:int LABEL::write(int x,y; dword _background, _color; byte fontSizePoints; dword text1)
{
signed len=0;
IF(!text1)return false;
243,7 → 243,8
IF(size.pt)IF(!changeSIZE())return false;
size.pt = fontSizePoints;
getsize(text1);
color = color1;
color = _color;
background = _background;
y -= size.offset_y;
EDX = size.width*size.height*3;
IF(!raw_size)
274,7 → 275,7
return len;
}
 
:void LABEL::write_buf(int x,y,w,h; dword background, color1; byte fontSizePoints; dword text1)
:void LABEL::write_buf(int x,y,w,h; dword _background, _color; byte fontSizePoints; dword text1)
{
dword new_raw_size;
IF(!text1)return;
283,7 → 284,8
size.pt = fontSizePoints;
getsize(text1);
y -= size.offset_y;
color = color1;
color = _color;
background = _background;
 
size.width = w;
size.height = h;
/programs/cmm/lib/gui.h
177,16 → 177,21
}
}
 
:void ShadowPixel(dword color_image, strength)
:dword ShadowPixel(dword dwColor, strength)
{
dword to = color_image + 3;
dword iB, iG, iR;
strength = 10 - strength;
for ( ; color_image < to; color_image++)
{
ESI = strength * DSBYTE[color_image] / 10;
DSBYTE[color_image] = ESI;
 
iB = dwColor & 0xFF; dwColor >>= 8;
iG = dwColor & 0xFF; dwColor >>= 8;
iR = dwColor & 0xFF; dwColor >>= 8;
 
iB = strength * iB / 10 << 16;
iG = strength * iG / 10 << 8;
iR = strength * iR / 10;
 
return iR + iG + iB;
}
}
:void ShadowImage(dword color_image, w, h, strength)
{
dword col, to;