Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 7888 → Rev 7889

/programs/cmm/TWB/TWB.c
97,8 → 97,8
text_color__ = text_colors[text_color_index];
if (link) && (text_colors[text_color_index]==text_colors[0]) text_color__ = link_color_default;
 
DrawBuf.WriteText(start_x, draw_y, list.font_type, text_color__, #line);
if (style.b) DrawBuf.WriteText(start_x+1, draw_y, list.font_type, text_color__, #line);
DrawBuf.WriteText(start_x, draw_y, list.font_type, text_color__, #line, NULL);
if (style.b) DrawBuf.WriteText(start_x+1, draw_y, list.font_type, text_color__, #line, NULL);
if (style.s) DrawBuf.DrawBar(start_x, list.item_h / 2 - zoom + draw_y, line_length, zoom, text_color__);
if (style.u) DrawBuf.DrawBar(start_x, list.item_h - zoom - zoom + draw_y, line_length, zoom, text_color__);
if (link) {
/programs/cmm/lib/draw_buf.h
64,7 → 64,7
}
}
 
void DrawBufer::WriteText(dword x, y, byte fontType, dword color, str_offset)
void DrawBufer::WriteText(dword x, y, byte fontType, dword color, str_offset, strlen)
{
#define BUGFIX_32000 32000
dword ydiv=0;
72,6 → 72,7
dword new_buf_offset;
if (y + 30 >= bufh) IncreaseBufSize();
if (y < BUGFIX_32000) {
ESI = strlen;
WriteBufText(x, y, fontType, color, str_offset, buf_data);
}
else {
84,6 → 85,7
 
ESDWORD[new_buf_offset] = bufw;
ESDWORD[new_buf_offset+4] = bufh - y;
ESI = strlen;
WriteBufText(x, y, fontType, color, str_offset, new_buf_offset);
 
ESDWORD[new_buf_offset] = reserve_data_1;
/programs/cmm/lib/io.h
154,15 → 154,15
$mov ebx,#__file_F70.func
$int 0x40
}
:int __FILE::write(dword write_file_size, write_buffer, write_file_path)
:int __FILE::write(dword write_offset, write_len, write_buffer, wfile_path)
{
__file_F70.func = 2;
__file_F70.param1 = 0;
__file_F70.param1 = write_offset;
__file_F70.param2 = 0;
__file_F70.param3 = write_file_size;
__file_F70.param3 = write_len;
__file_F70.param4 = write_buffer;
__file_F70.rezerv = 0;
__file_F70.name = io.path.path(write_file_path);
__file_F70.name = io.path.path(wfile_path);
$mov eax,70
$mov ebx,#__file_F70.func
$int 0x40
326,7 → 326,7
}
:int IO::write(dword PATH,data)
{
file.write(0,strlen(data),data,PATH);
return file.write(0,strlen(data),data,PATH);
}
:char BYTE_HEAD_FILE_KPCK[4];
:dword IO::read(dword PATH)
355,6 → 355,7
$mov eax,70
$mov ebx,#__file_F70.func
$int 0x40
return EAX;
}
:signed IO::count(dword PATH)
{
/programs/cmm/txtread/ini.h
2,7 → 2,7
 
void LoadIniSettings()
{
kfont.size.pt = ini.GetInt("FontSize", 14);
kfont.size.pt = ini.GetInt("FontSize", 13);
encoding = ini.GetInt("Encoding", CH_AUTO);
curcol_scheme = ini.GetInt("ColorScheme", 2);
Form.left = ini.GetInt("WinX", 150);
/programs/network/ircc/gui.inc
272,11 → 272,12
mov edx, WINDOW_BTN_START
mov edi, windows
.more_btn:
mov esi, [colors.work_button]
mov esi, [colors.work]
cmp [window_active], edi
jne @f
not esi
and esi, 0x00ffffff
;not esi
;and esi, 0x00ffffff
mov esi, [colors.work_light]
@@:
mcall
inc edx
299,6 → 300,17
mov edx, WINDOW_BTN_CLOSE
mov esi, 0x00aa0000 ; red !
mcall
 
pusha
; write closing cross
mov ebx, [xsize]
sub ebx, 9
shl ebx, 16
add ebx, TOP_SPACE+3
mov ecx, 0x80FFFfff
mov edx, closing_cross
mcall 4
popa
@@:
 
; Draw the windownames onto the buttons
308,7 → 320,7
mov esi, MAX_WINDOWS
mov edi, windows
.more:
mov ecx, [colors.work_button_text]
mov ecx, [colors.work_text]
test [edi + window.flags], FLAG_UPDATED
jz @f
mov ecx, 0x00aa0000 ; RED!
/programs/network/ircc/ircc.asm
559,6 → 559,8
default_real db 'Kolibri User', 0
default_quit db 'KolibriOS forever', 0
 
closing_cross db 'x',0
 
irc_colors dd 0xffffff ; 0 white
dd 0x000000 ; 1 black
dd 0x00007f ; 2 blue (navy)