KolibriOS/kolibrios
13
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

calc: return to system colors

Browse Source 
git-svn-id: svn://kolibrios.org@5547 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-03-24 23:05:16 +00:00
parent 99e21e866c
commit 2d64a2d4dd
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -636,7 +636,7 @@ atof_convertFractionalPart:
draw_window: draw_window:
mcall 12, 1 mcall 12, 1
mcall 48, 3, sc, 192 mcall 48, 3, sc, sizeof.system_colors
mcall 48, 4 mcall 48, 4
@ -644,7 +644,7 @@ draw_window:
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 + 158
mov edx, [sc.win_body] mov edx, [sc.work]
or edx, 0x34000000 or edx, 0x34000000
mov edi, title mov edi, title
mcall mcall
@ -653,7 +653,7 @@ draw_window:
mov ebx, 19 shl 16 + 28 mov ebx, 19 shl 16 + 28
mov ecx, 49 shl 16 + 18 mov ecx, 49 shl 16 + 18
mov edx, 6 mov edx, 6
mov esi, [sc.btn_face] mov esi, [sc.work_button]
mov edi, 7 mov edi, 7
newbutton: newbutton:
dec edi dec edi
@ -672,7 +672,7 @@ no_new_row:
mcall , <220, 8>, < 7, 8>, 3 ; 'dec-bin-hex' mcall , <220, 8>, < 7, 8>, 3 ; 'dec-bin-hex'
mov ecx, [sc.btn_text] mov ecx, [sc.work_button_text]
mov edx, text mov edx, text
mov edi, 55 - 20 mov edi, 55 - 20
next_line: next_line:
@ -704,19 +704,19 @@ next_button:
print_display: print_display:
pusha pusha
mcall 13, < 20, 207>, <21, 17>, [sc.gui_face] mcall 13, < 20, 207>, <21, 17>, 0xFFFfff
mcall 38, < 19, 227>, <20, 20>, [sc.gui_frame] mcall 38, < 19, 227>, <20, 20>, [sc.work_graph]
mcall 38, < 19, 227>, <38, 38>, [sc.gui_frame] mcall 38, < 19, 227>, <38, 38>, [sc.work_graph]
mcall 38, < 19, 19>, <21, 37>, [sc.gui_frame] mcall 38, < 19, 19>, <21, 37>, [sc.work_graph]
mcall 38, <227, 227>, <21, 37>, [sc.gui_frame] mcall 38, <227, 227>, <21, 37>, [sc.work_graph]
mov eax, 4 mov eax, 4
mov ebx, 135 shl 16 + 7 mov ebx, 135 shl 16 + 7
mov ecx, [sc.gui_text] mov ecx, [sc.work_text]
or ecx, 0x40000000 or ecx, 0x40000000
mov edx, calc mov edx, calc
mov esi, 1 mov esi, 1
mov edi, [sc.win_body] mov edi, [sc.work]
mcall mcall
mov ebx, 198 shl 16 + 8 mov ebx, 198 shl 16 + 8
@ -724,7 +724,7 @@ print_display:
shl edx, 2 shl edx, 2
add edx, display_type_text add edx, display_type_text
mov esi, 3 mov esi, 3
mov edi, [sc.win_body] mov edi, [sc.work]
mcall mcall
cmp [dsign], byte '+' cmp [dsign], byte '+'
@ -841,6 +841,6 @@ butid: db 12, 13, 14, 19, 20, 21, 26, 27, 28, 34, 15, 39, 22, 36, 29, 35, 35, 1
I_END: I_END:
sc sys_colors_new sc system_colors
rb 0x200 ; stack rb 0x200 ; stack
E_END: E_END: