badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

Support of background color for control Text is added.

Browse Source 
git-svn-id: svn://kolibrios.org@676 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
andrew_programmer 2007-11-27 22:04:00 +00:00
parent 21d1027a5a
commit dc008c6f30
5 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
programs/develop/libGUI/examples/text/text.asm
View File

@ -96,8 +96,9 @@ start:
;******************Init Text***************** ;******************Init Text*****************
;******************************************** ;********************************************
mov [Text.type],byte 10000000b mov [Text.type],byte 10000010b
mov [Text.color],0xffffff mov [Text.color],0xffffff
mov [Text.background_color],0xff
mov [Text.x],5 mov [Text.x],5
mov [Text.y],10 mov [Text.y],10
mov [Text.length],36 mov [Text.length],36
@ -356,6 +357,7 @@ struc TEXT
.y rd 1 .y rd 1
.length rd 1 .length rd 1
.pointer rd 1 .pointer rd 1
.background_color rd 1
} }
Button1 BUTTON Button1 BUTTON

2
programs/develop/libGUI/src/VERSION.INC
View File

@ -11,6 +11,6 @@ align 4
get_version: get_version:
xor eax,eax xor eax,eax
mov eax,dword 071119 ;07.11.19 mov eax,dword 071128 ;07.11.28
ret ret

2
programs/develop/libGUI/src/libGUI.asm
View File

@ -410,6 +410,7 @@ struc TEXT
.y rd 1 .y rd 1
.length rd 1 .length rd 1
.pointer rd 1 .pointer rd 1
.background_color rd 1
} }
struc NUMBER struc NUMBER
@ -544,3 +545,4 @@ pointer2 rd 13
IPC_table process_information; rb 1024 IPC_table process_information; rb 1024
colors_table1 rd 15 colors_table1 rd 15
colors_table2 rd 15 colors_table2 rd 15

27
programs/develop/libGUI/src/text.inc
View File

@ -1,10 +1,11 @@
tx_control_data_size = 22 tx_control_data_size = 26
tx_no_show_text = 00000001b tx_no_show_text = 00000001b
tx_text_and_background = 00000010b
tx_redraw_all = 10000000b tx_redraw_all = 10000000b
tx_redraw_all_off = 01111111b tx_redraw_all_off = 01111111b
tx_special_redraw_on = 00000100b ;tx_special_redraw_on = 00000100b
tx_special_redraw_off = 11111011b ;tx_special_redraw_off = 11111011b
;**************************************************** ;****************************************************
;********************craete Text********************** ;********************craete Text**********************
@ -95,12 +96,12 @@ text:
xor ebx,ebx xor ebx,ebx
mov bl,[Text.type] mov bl,[Text.type]
and bl,tx_special_redraw_on and bl,activate_trap
test bl,bl test bl,bl
jz no_special_message_for_text jz no_special_message_for_text
or [Text.type],tx_redraw_all or [Text.type],tx_redraw_all
and [Text.type],tx_special_redraw_off and [Text.type],deactivate_trap
no_special_message_for_text: no_special_message_for_text:
@ -127,20 +128,32 @@ text:
and [Text.type],tx_redraw_all_off and [Text.type],tx_redraw_all_off
mov esi,dword Text mov esi,dword Text
mov edi,[PointerForText] mov edi,[PointerForText]
add edi,control_header_size add edi,control_header_size
mov ecx,2 mov ecx,2
rep movsb rep movsb
mov ecx,[Text.color]
xor eax,eax
mov al,[Text.type]
and al,tx_text_and_background
test al,al
jz no_background_color
mov edi,[Text.background_color]
or ecx,01000000000000000000000000000000b
no_background_color:
mov eax,4 mov eax,4
mov ebx,[Text.x] mov ebx,[Text.x]
shl ebx,16 shl ebx,16
add ebx,[Text.y] add ebx,[Text.y]
mov ecx,[Text.color]
mov edx,[Text.pointer] mov edx,[Text.pointer]
mov esi,[Text.length] mov esi,[Text.length]
mov edi,[pointer2+8]
mcall mcall
no_redraw_text_: no_redraw_text_:

10
programs/develop/libGUI/whats new.txt
View File

@ -1,3 +1,13 @@
28.11.07
RUSSIAN
Äîáàâëåíà ïîääåðæêà ôîíîâîãî öâåòà äëÿ control-à Text.
ENGLISH
Support of background color for control Text is added.
19.11.07 19.11.07
RUSSIAN RUSSIAN