Fixed bug in automatic text scrolling.

git-svn-id: svn://kolibrios.org@6097 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2016-01-26 00:43:09 +00:00
parent 473b41df34
commit 5cf2fe46d9
2 changed files with 6 additions and 3 deletions

View File

@ -13,7 +13,7 @@
;; ;; ;; ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
version equ '0.26' version equ '0.27'
; connection status ; connection status
STATUS_DISCONNECTED = 0 STATUS_DISCONNECTED = 0

View File

@ -207,7 +207,10 @@ draw_channel_text:
; Scrollbar was at lowest position, scroll down automatically when new text arrived. ; Scrollbar was at lowest position, scroll down automatically when new text arrived.
mov edx, [edi + window.text_lines] mov edx, [edi + window.text_lines]
sub edx, [textbox_height] sub edx, [textbox_height]
jle .noscroll ; There are less lines of text than fit into the window, dont scroll.. jg @f
mov [edi + window.text_line_print], 0
jmp .noscroll ; There are less lines of text than fit into the window, dont scroll..
@@:
sub edx, [edi + window.text_line_print] sub edx, [edi + window.text_line_print]
je .noscroll ; We are already at the bottom pos, dont scroll.. je .noscroll ; We are already at the bottom pos, dont scroll..
.scroll_to_pos: ; edx = number of lines to go up/down (flags must indicate direction) .scroll_to_pos: ; edx = number of lines to go up/down (flags must indicate direction)
@ -215,7 +218,7 @@ draw_channel_text:
add [edi + window.text_line_print], edx add [edi + window.text_line_print], edx
mov esi, [edi + window.text_print] mov esi, [edi + window.text_print]
popf popf
ja .loop_forward jg .loop_forward
std ; set direction flag so we can scan backwards std ; set direction flag so we can scan backwards
dec esi dec esi
dec esi ; move our cursor just in front of newline, for scanning backwards dec esi ; move our cursor just in front of newline, for scanning backwards