Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3113 → Rev 3114

/programs/cmm/lib/figures.h
56,4 → 56,24
DrawRectangle3D(x+1, y+1, w-2, h-2, 0xDDDddd, 0xffffff);
DrawBar(x+2, y+2, w-3, h-3, 0xffffff);
}
}
 
void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent, status_text)
{
int progress_w = progress_percent * st_w / 100 - 3;
static int fill_old;
if (!progress_percent) {DrawBar(st_x,st_y, st_x + st_y + fill_old + 15,st_h+1, col_fon); return;}
DrawRectangle(st_x, st_y, st_w,st_h, col_border);
DrawRectangle3D(st_x+1, st_y+1, st_w-2,st_h-2, 0xFFFfff, 0xFFFfff);
if (progress_percent) DrawBar(st_x+2, st_y+2, progress_w, st_h-3, col_fill);
if (progress_percent<100) DrawBar(st_x+2+progress_w, st_y+2, st_w-progress_w-3, st_h-3, 0xFFFfff);
if (status_text)
{
DrawBar(st_x+st_w+15, st_h/2-4+st_y, fill_old, 9, col_fon);
WriteText(st_x+st_w+15, st_h/2-4+st_y, 0x80, col_text, status_text);
fill_old = strlen(status_text) * 6;
}
}
/programs/cmm/lib/kolibri.h
219,6 → 219,13
$int 0x40
}
 
inline fastcall void ActivateWindow( ECX)
{
EAX = 18;
EBX = 3;
$int 0x40
}
 
inline fastcall int CreateThread( ECX,EDX)
{
$mov eax,51
/programs/cmm/lib/strings.h
114,6 → 114,8
dword itoa( ESI)
{
unsigned char buffer[11];
$pusha
 
EDI = #buffer;
ECX = 10;
if (ESI < 0)
140,6 → 142,7
$mov al, '\0'
$stosb
$popa
return #buffer;
}
 
/programs/cmm/tmpdisk/t_console.c
58,9 → 58,7
add_disk.DiskSize = GetFreeRAM() / 5;
debug("disk size is not specified");
strcpy(#size_t, "10% from free RAM will be used, new DiskSize: ");
driver_rezult=itoa(add_disk.DiskSize/2048);
strcat(#size_t, driver_rezult);
//strcat(#size_t, itoa(add_disk.DiskSize/2048));
strcat(#size_t, itoa(add_disk.DiskSize/2048));
strcat(#size_t, " MB");
debug(#size_t);
}