XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

Calc 1.35: use big font for number display

Browse Source 
git-svn-id: svn://kolibrios.org@5673 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-08-04 13:40:51 +00:00
parent e390d5e509
commit 1a537e6e27
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
programs/other/calc/trunk/calc.asm
View File

@ -643,7 +643,7 @@ draw_window:
mov ecx, eax mov ecx, eax
xor eax, eax xor eax, eax
mov ebx, 200 shl 16 + 256 mov ebx, 200 shl 16 + 256
add ecx, 200 shl 16 + 158 add ecx, 200 shl 16 + 163
mov edx, [sc.work] mov edx, [sc.work]
or edx, 0x34000000 or edx, 0x34000000
mov edi, title mov edi, title
@ -651,7 +651,7 @@ draw_window:
mov eax, 8 mov eax, 8
mov ebx, 19 shl 16 + 28 mov ebx, 19 shl 16 + 28
mov ecx, 49 shl 16 + 18 mov ecx, 55 shl 16 + 18
mov edx, 6 mov edx, 6
mov esi, [sc.work_button] mov esi, [sc.work_button]
mov edi, 7 mov edi, 7
@ -668,13 +668,13 @@ no_new_row:
cmp edx, 39 cmp edx, 39
jbe newbutton jbe newbutton
mcall , <199, 28>, <49, 18>, 2 ; 'C' mcall , <199, 28>, <55, 18>, 2 ; 'C'
mcall , <220, 8>, < 7, 8>, 3 ; 'dec-bin-hex' mcall , <220, 8>, < 7, 8>, 3 ; 'dec-bin-hex'
mov ecx, [sc.work_button_text] mov ecx, [sc.work_button_text]
mov edx, text mov edx, text
mov edi, 55 - 20 mov edi, 55 - 15
next_line: next_line:
inc edx inc edx
and edi, 0x0000ffff and edi, 0x0000ffff
@ -704,11 +704,13 @@ next_button:
print_display: print_display:
pusha pusha
mcall 13, < 20, 207>, <21, 17>, 0xFFFfff mcall 13, < 21, 206>, <22, 24>, 0xFFFfff
mcall 38, < 19, 227>, <20, 20>, [sc.work_graph] mcall 38, < 19, 227>, <20, 20>, [sc.work_graph]
mcall 38, < 19, 227>, <38, 38>, [sc.work_graph] mcall 38, < 20, 226>, <21, 21>, 0xE0E0E0 ; internal shadow
mcall 38, < 19, 19>, <21, 37>, [sc.work_graph] mcall 38, < 19, 227>, <45, 45>, [sc.work_graph]
mcall 38, <227, 227>, <21, 37>, [sc.work_graph] mcall 38, < 19, 19>, <21, 44>, [sc.work_graph]
mcall 38, < 20, 20>, <23, 43>, 0xE0E0E0 ; internal shadow
mcall 38, <227, 227>, <21, 44>, [sc.work_graph]
mov eax, 4 mov eax, 4
mov ebx, 135 shl 16 + 7 mov ebx, 135 shl 16 + 7
@ -737,19 +739,19 @@ positive:
cmp [decimal], 0 cmp [decimal], 0
je whole je whole
mcall , <180, 26>, 0, dot, 1 mcall , <144, 26>, [number_color], dot, 1
mcall 47, <10, 0>, [integer], <120, 22>, 0 mcall 47, <10, 0>, [integer], <26, 26>, [number_color]
mcall , <6, 0>, [decimal], <187, 22>, 0 mcall , <6, 0>, [decimal], <151, 26>, [number_color]
popa popa
ret ret
whole: whole:
mcall , <220, 26>, 0, dot, 1 mcall , <214, 26>, [number_color], dot, 1
cmp [integer], 0 cmp [integer], 0
je null je null
mcall 47, <10, 0>, [integer], <160, 26>, 0 mcall 47, <10, 0>, [integer], <94, 26>, [number_color]
popa popa
ret ret
@ -758,19 +760,19 @@ no_display_decimal:
jne no_display_hexadecimal jne no_display_hexadecimal
cmp [integer], 0 cmp [integer], 0
je null je null
mcall 47, <8, 256>, [integer], <173, 26>, 0 mcall 47, <8, 256>, [integer], <130, 26>, [number_color]
popa popa
ret ret
no_display_hexadecimal: no_display_hexadecimal:
cmp [integer], 0 cmp [integer], 0
je null je null
mcall 47, <32, 2*256>, [integer], <32, 26>, 0 mcall 47, <32, 2*256>, [integer], <32, 30>, 0
popa popa
ret ret
null: null:
mcall 47, <1, 0>, 0, <214, 26>, 0 mcall 47, <1, 0>, 0, <202, 26>, [number_color]
popa popa
ret ret
@ -798,14 +800,15 @@ clear_all:
;data ;data
title db 'Calc 1.33', 0 title db 'Calc 1.35', 0
display_type dd 0 ; 0 = decimal, 1 = hexadecimal, 2= binary display_type dd 0 ; 0 = decimal, 1 = hexadecimal, 2= binary
entry_multiplier dd 10 entry_multiplier dd 10
display_type_text db 'dec hex bin' display_type_text db 'dec hex bin'
number_color dd 0x81333333
dot db '.' dot db '.',0
calc db ' ' calc db ' ',0
integer dd 0 integer dd 0
decimal dd 0 decimal dd 0
kymppi dd 10 kymppi dd 10