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

colorref: erase the name of bottom color properly: the very bottom pixel of 'Q' became an artefact if one chooses 'ultramarine' after 'light turquoise'

Browse Source 
git-svn-id: svn://kolibrios.org@5824 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2015-09-08 22:02:31 +00:00
parent e7b30b9ca0
commit 2cc8fd4d51
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
programs/demos/colorref/trunk/colorref.asm
View File

@ -93,7 +93,6 @@ s3: mov eax,9 ; process info function
jne l1 ; no, do it jne l1 ; no, do it
jmp still jmp still
l1: mov [picks],edx ; update left pick color l1: mov [picks],edx ; update left pick color
call clear ; erase old text
call draw_picks ; redraw colors and text call draw_picks ; redraw colors and text
jmp still jmp still
right: right:
@ -101,7 +100,6 @@ l1: mov [picks],edx ; update left pick color
jne r1 ; no, do it jne r1 ; no, do it
jmp still jmp still
r1: mov [picks+4],edx ; update right pick color r1: mov [picks+4],edx ; update right pick color
call clear ; erase old text
call draw_picks ; redraw colors and text call draw_picks ; redraw colors and text
jmp still jmp still
@ -145,7 +143,7 @@ draw_window:
mcall 12,1 mcall 12,1
mov eax,0 ; DRAW WINDOW mov eax,0 ; DRAW WINDOW
mov ebx,1*65536+200 ; [x start] *65536 + [x size] mov ebx,1*65536+(200-1) ; [x start] *65536 + [x size]
mov ecx,200*65536+240 ; [y start] *65536 + [y size] mov ecx,200*65536+240 ; [y start] *65536 + [y size]
mov edx,0x14000000 ; work area color (type II) mov edx,0x14000000 ; work area color (type II)
mov edi,title ; frame color mov edi,title ; frame color
@ -227,7 +225,8 @@ do_hex:
mov ecx,[edi] ; save color 1 mov ecx,[edi] ; save color 1
mov ebx,0x60100 ; print 6 hex digits mov ebx,0x60100 ; print 6 hex digits
mov edx,esi ; copy color mov edx,esi ; copy color
mov esi,0xe1e1e1 ; use white mov esi,0x40e1e1e1 ; use white
xor edi, edi
mov eax,47 ; print number function mov eax,47 ; print number function
mcall mcall
@ -252,26 +251,14 @@ do_name:
mul ecx ; calc pointer mul ecx ; calc pointer
mov edx,names ; color table mov edx,names ; color table
add edx,eax ; add offset add edx,eax ; add offset
mov ecx,0xe1e1e1 ; color mov ecx,0x40e1e1e1 ; color
mov esi,15 mov esi,15
xor edi, edi
mov eax,4 ; print text function mov eax,4 ; print text function
mcall mcall
ret ret
clear:
mov ebx,22*65536+36 ; x and width
mov ecx,196*65536+26 ; y and depth
mov edx,0x000000 ; color
mov eax,13 ; draw bar funx
mcall
mov ebx,96*65536+90 ; x and width
mov ecx,196*65536+26 ; y and depth
mov edx,0x000000 ; color
mov eax,13 ; draw bar funx
mcall
ret
help: help:
mcall 48,4 mcall 48,4
@ -281,7 +268,7 @@ help:
sub ecx, eax sub ecx, eax
mov ebx,5*65536+191 ; x and width mov ebx,5*65536+190 ; x and width
mov edx,0x465e8f ; dark denim color mov edx,0x465e8f ; dark denim color
mov eax,13 ; write text funx mov eax,13 ; write text funx
mcall mcall