From 7a11c2f2d62bffb96dd5a35fec3cccb7f04a233f Mon Sep 17 00:00:00 2001 From: gtament Date: Sun, 13 Apr 2014 11:19:26 +0000 Subject: [PATCH] Fixed my unaligned text fix in IRCc git-svn-id: svn://kolibrios.org@4828 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/network/ircc/ircc.asm | 5 +++-- programs/network/ircc/window.inc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/network/ircc/ircc.asm b/programs/network/ircc/ircc.asm index 466a6203ba..7d1957638a 100644 --- a/programs/network/ircc/ircc.asm +++ b/programs/network/ircc/ircc.asm @@ -417,9 +417,10 @@ mouse: mov edx, [scroll2.position] add edx, [scroll2.cur_area] sub edx, [scroll2.max_area] - jne @f + jne .not_low or [edi+window.flags], FLAG_SCROLL_LOW - @@: mov edx, [scroll2.position] + .not_low: + mov edx, [scroll2.position] sub edx, [edi + window.text_line_print] je @f call draw_channel_text.scroll_to_pos diff --git a/programs/network/ircc/window.inc b/programs/network/ircc/window.inc index 4225a51f05..deda67e108 100644 --- a/programs/network/ircc/window.inc +++ b/programs/network/ircc/window.inc @@ -35,7 +35,7 @@ window_create_textbox: pop eax mov [ebx + window.data_ptr], eax - mov [ebx + window.flags], 0x04 + mov [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