Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6263 → Rev 6264

/programs/cmm/lib/font.h
133,7 → 133,7
}
size.width += rw;
IF(bold) size.width+=size.TMP_WEIGHT;
IF(s=='_') size.width--;
//IF(s=='_') size.width--; //http://board.kolibrios.org/viewtopic.php?f=44&t=973&start=645
IF(size.offset_x<0)size.offset_x = X;
}
:byte LABEL::symbol(signed x,y; byte s; dword image_raw)
275,7 → 275,7
len = size.offset_x;
WHILE(DSBYTE[text1])
{
IF(DSBYTE[text1]=='_') len--;
//IF(DSBYTE[text1]=='_') len--; //http://board.kolibrios.org/viewtopic.php?f=44&t=973&start=645
len+=symbol(len,0,DSBYTE[text1], raw);
IF(bold)len+=math.ceil(size.pt/17);
text1++;
/programs/cmm/lib/gui.h
267,4 → 267,49
return n;
}
 
 
/*=========================================================
==
== TABS
==
/========================================================*/
 
#define TAB_PADDING 25
#define TAB_HEIGHT 25
 
struct _tabs
{
int active_tab;
void draw();
int click();
} tabs;
 
void _tabs::draw(dword x,y, but_id, text)
{
dword col_bg, col_text;
dword w=strlen(text)*8+TAB_PADDING, h=TAB_HEIGHT;
y -= h;
 
if (but_id==active_tab)
{
col_bg=system.color.work_button;
col_text=system.color.work_button_text;
}
else
{
col_bg=system.color.work;
col_text=system.color.work_text;
}
DrawCaptButton(x,y, w-1,h+1, but_id, col_bg, col_text, text);
}
 
int _tabs::click(int N)
{
if (N==active_tab) return false;
active_tab = N;
return true;
}
 
 
 
#endif