From d6e2af938530d72e3206c43b8309fb7e6a672999 Mon Sep 17 00:00:00 2001 From: pathoswithin Date: Sun, 6 Nov 2016 03:56:19 +0000 Subject: [PATCH] save font settings for system color git-svn-id: svn://kolibrios.org@6681 a494cfbc-eb01-0410-851d-a64ba20cac60 --- .../libraries/box_lib/trunk/box_lib.mac | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/programs/develop/libraries/box_lib/trunk/box_lib.mac b/programs/develop/libraries/box_lib/trunk/box_lib.mac index 1644d68c71..a863956bc4 100644 --- a/programs/develop/libraries/box_lib/trunk/box_lib.mac +++ b/programs/develop/libraries/box_lib/trunk/box_lib.mac @@ -89,26 +89,23 @@ macro edit_boxes_set_sys_color start,end,color_table mov ecx,((end-start)/ed_struc_size) mov esi,color_table @@: - mov eax,dword [esi+36] ;цвет графики в окне (разделительные линии и т.п.) - mov ebx,dword [esi+20] ;цвет рабочей области окна - push dword eax - pop dword ed_focus_border_color - shr bh,1 - shr bl,1 - shr ah,1 - shr al,1 - add ah,bh - add al,bl - ror eax,16 - ror ebx,16 - shr bl,1 - shr al,1 - add al,bl - ror eax,16 - mov dword ed_blur_border_color,eax - mov dword shift_color,eax - push dword [esi+32] ;цвет текста в рабочей области окна - pop dword ed_text_color + mov eax,[esi+36] + mov ebx,[esi+20] + mov ed_focus_border_color,eax + shr eax,1 + shr ebx,1 + and eax,7F7F7Fh + and ebx,7F7F7Fh + add eax,ebx + mov ed_blur_border_color,eax + mov shift_color,eax + mov eax,ed_text_color + mov ebx,[esi+32] + shr eax,24 + shl ebx,8 + add eax,ebx + ror eax,8 + mov ed_text_color,eax add edi,ed_struc_size loop @b }