Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 4823 → Rev 4824

/programs/network/ircc/ircc.asm
13,7 → 13,7
;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
version equ '0.22'
version equ '0.23'
 
; connection status
STATUS_DISCONNECTED = 0
24,6 → 24,7
; window flags
FLAG_UPDATED = 1 shl 0
FLAG_RECEIVING_NAMES = 1 shl 1
FLAG_SCROLL_LOW = 1 shl 2
 
; window types
WINDOWTYPE_NONE = 0
412,7 → 413,13
push dword scroll2
call [scrollbar_mouse]
mov edi, [window_active]
and [edi+window.flags], not FLAG_SCROLL_LOW
mov edx, [scroll2.position]
add edx, [scroll2.cur_area]
sub edx, [scroll2.max_area]
jne @f
or [edi+window.flags], FLAG_SCROLL_LOW
@@: mov edx, [scroll2.position]
sub edx, [edi + window.text_line_print]
je @f
call draw_channel_text.scroll_to_pos
/programs/network/ircc/textbox.inc
179,12 → 179,13
mov [edi + window.text_scanned], esi
 
; Is scrollbar at lowest position?
mov edx, [scroll2.position]
test edx, edx
jz .yesscroll
add edx, [scroll2.cur_area]
sub edx, [scroll2.max_area]
jne .noscroll
test [edi + window.flags], FLAG_SCROLL_LOW
jnz .yesscroll ;Yes
cmp [scroll2.all_redraw], 1 ;No
jnz .noscroll
mov edx, [textbox_height]
sub edx, [edi + window.text_line_print]
jg .noscroll
.yesscroll:
; Scrollbar was at lowest position, scroll down automatically when new text arrived.
mov edx, [edi + window.text_lines]
/programs/network/ircc/window.inc
36,6 → 36,7
 
mov [ebx + window.data_ptr], eax
mov [ebx + window.flags], 0
or [ebx + window.flags], FLAG_SCROLL_LOW
 
add eax, window_data.text+2 ; let text begin at offset 2, this way the text will be prepended with two null bytes
mov [ebx + window.text_start], eax