Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9594 → Rev 9602

/programs/cmm/lib/patterns/select_list.h
55,8 → 55,8
void SelectList_DrawBorder() {
DrawRectangle3D(select_list.x-2, select_list.y-2,
select_list.w+3+scroll1.size_x, select_list.h+3,
sc.work_dark, sc.work_light);
DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, sc.work_graph);
sc.dark, sc.light);
DrawRectangle(select_list.x-1, select_list.y-1, select_list.w+1+scroll1.size_x, select_list.h+1, sc.line);
}
 
void SelectList_DrawScroller()
63,7 → 63,7
{
scroll1.bckg_col = MixColors(sc.work, 0xBBBbbb, 80);
scroll1.frnt_col = MixColors(sc.work,0xFFFfff,120);
scroll1.line_col = sc.work_graph;
scroll1.line_col = sc.line;
 
scroll1.max_area = select_list.count;
scroll1.cur_area = select_list.visible;
/programs/cmm/lib/patterns/toolbar_button.h
14,21 → 14,21
#define TSZE 25
static dword lightest, i16_mem, old_work_light;
dword i16_size;
if (!lightest) || (old_work_light != sc.work_light) {
old_work_light = sc.work_light;
lightest = MixColors(sc.work_light, 0xFFFfff, skin_is_dark()*155 + 20);
if (!lightest) || (old_work_light != sc.light) {
old_work_light = sc.light;
lightest = MixColors(sc.light, 0xFFFfff, skin_is_dark()*155 + 20);
if (ESI = memopen("ICONS18", NULL, SHM_READ)) {
i16_size = EDX;
i16_mem = malloc(i16_size);
memmov(i16_mem, ESI, i16_size);
replace_2cols(i16_mem, i16_size, 0xffFFFfff, sc.work_light, 0xffCACBD6, sc.work_dark);
replace_2cols(i16_mem, i16_size, 0xffFFFfff, sc.light, 0xffCACBD6, sc.dark);
}
}
DrawWideRectangle(_x+1, _y+1, TSZE, TSZE, 5, sc.work_light);
DrawWideRectangle(_x+1, _y+1, TSZE, TSZE, 5, sc.light);
DefineHiddenButton(_x, _y, TSZE+1, TSZE+1, _button_id);
if (_icon_n==-1) {
DrawBar(_x+6, _y+5, 16, 16, sc.work_light);
DrawBar(_x+6, _y+7, 15, 3, sc.work_graph);
DrawBar(_x+6, _y+5, 16, 16, sc.light);
DrawBar(_x+6, _y+7, 15, 3, sc.line);
$add ecx,5*65536
$int 64
$add ecx,5*65536
39,9 → 39,9
}
 
if (!pressed) {
DrawOvalBorder(_x, _y, TSZE, TSZE, lightest, sc.work_graph, sc.work_light, sc.work);
DrawOvalBorder(_x, _y, TSZE, TSZE, lightest, sc.line, sc.light, sc.work);
} else {
DrawOvalBorder(_x, _y, TSZE, TSZE, sc.work_graph, sc.work_light, sc.work_dark, sc.work);
DrawOvalBorder(_x, _y, TSZE, TSZE, sc.line, sc.light, sc.dark, sc.work);
PutShadow(_x+1, _y+1, TSZE, TSZE, true, 2);
}