From f53424d741d8b6ba9a9e016a690c35d0ad282bc7 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 7 May 2020 20:03:43 +0000 Subject: [PATCH] ircc: colors live update git-svn-id: svn://kolibrios.org@7890 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/network/ircc/gui.inc | 44 +++++++++++++++++++++++++--------- programs/network/ircc/ircc.asm | 23 ++---------------- 2 files changed, 35 insertions(+), 32 deletions(-) diff --git a/programs/network/ircc/gui.inc b/programs/network/ircc/gui.inc index e952cfe902..c9e4eac355 100644 --- a/programs/network/ircc/gui.inc +++ b/programs/network/ircc/gui.inc @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2018. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2020. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; Written by hidnplayr@kolibrios.org ;; @@ -15,6 +15,10 @@ draw_window: ; Completely redraw the window, recalculate all coordinates and pusha +; get system colors + mcall 48, 3, colors, 40 + call set_edit_box_and_scrollbar_colors + mcall 9, thread_info, -1 ; get information about this thread mov eax, [thread_info.box.width] ; window xsize mov ebx, [thread_info.box.height] ; ysize @@ -277,7 +281,7 @@ draw_window_tabs: jne @f ;not esi ;and esi, 0x00ffffff - mov esi, [colors.work_light] + mov esi, [colors.work_light] @@: mcall inc edx @@ -299,18 +303,18 @@ draw_window_tabs: mov ecx, TOP_SPACE shl 16 + TAB_HEIGHT - 1 mov edx, WINDOW_BTN_CLOSE mov esi, 0x00aa0000 ; red ! - mcall + mcall - pusha - ; write closing cross - mov ebx, [xsize] - sub ebx, 9 + 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 + add ebx, TOP_SPACE+3 + mov ecx, 0x80FFFfff + mov edx, closing_cross mcall 4 - popa + popa @@: ; Draw the windownames onto the buttons @@ -360,4 +364,22 @@ highlight_updated_tabs: jnz .more_ .enough_: + ret + +set_edit_box_and_scrollbar_colors: + mov eax, [colors.work] + mov [scroll1.bg_color], eax + mov [scroll2.bg_color], eax + + mov eax, [colors.work_button] + mov [scroll1.front_color], eax + mov [scroll2.front_color], eax + + mov eax, [colors.work_text] + mov [scroll1.line_color], eax + mov [scroll2.line_color], eax + + mov [scroll1.type], 0 ; 0 = simple, 1 = skinned + mov [scroll2.type], 0 + ret \ No newline at end of file diff --git a/programs/network/ircc/ircc.asm b/programs/network/ircc/ircc.asm index 24c4843a24..64353dda67 100644 --- a/programs/network/ircc/ircc.asm +++ b/programs/network/ircc/ircc.asm @@ -1,6 +1,6 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; -;; Copyright (C) KolibriOS team 2004-2018. All rights reserved. ;; +;; Copyright (C) KolibriOS team 2004-2020. All rights reserved. ;; ;; Distributed under terms of the GNU General Public License ;; ;; ;; ;; IRC client for KolibriOS ;; @@ -13,7 +13,7 @@ ;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -version equ '0.31' +version equ '0.32' ; connection status STATUS_DISCONNECTED = 0 @@ -186,25 +186,6 @@ START: jz exit mov [ebx + window.type], WINDOWTYPE_SERVER -; get system colors - mcall 48, 3, colors, 40 - -; set edit box and scrollbar colors - mov eax, [colors.work] - mov [scroll1.bg_color], eax - mov [scroll2.bg_color], eax - - mov eax, [colors.work_button] - mov [scroll1.front_color], eax - mov [scroll2.front_color], eax - - mov eax, [colors.work_text] - mov [scroll1.line_color], eax - mov [scroll2.line_color], eax - - mov [scroll1.type], 1 ; 0 = simple, 1 = skinned - mov [scroll2.type], 1 - ; get settings from ini invoke ini.get_str, path, str_user, str_nick, user_nick, MAX_NICK_LEN, default_nick invoke ini.get_str, path, str_user, str_real, user_real_name, MAX_REAL_LEN, default_real