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

color dialog: add OK, Cancel buttons

Browse Source 
git-svn-id: svn://kolibrios.org@6054 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-01-11 00:36:11 +00:00
parent e5231646b3
commit ea44c6289b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
programs/system/colrdial/color_dialog.asm
View File

@ -281,7 +281,7 @@ get_communication_area:
mov ebx,[eax+8] mov ebx,[eax+8]
; cmp bx,word y_minimal_size ;200 ; cmp bx,word y_minimal_size ;200
; jb @f ; jb @f
mov bx,310 mov bx,340
mov [window_y],ebx mov [window_y],ebx
@@: @@:
ret ret
@ -580,10 +580,13 @@ draw_window:
mcall 12,1 mcall 12,1
; mcall 0, <w_start_x,w_size_x>, <w_start_y,w_size_y>, 0x33AABBCC,,title ; mcall 0, <w_start_x,w_size_x>, <w_start_y,w_size_y>, 0x33AABBCC,,title
xor esi,esi xor esi,esi
mcall 0,[window_x],[window_y], 0x34AABBCC,,title mcall 0,[window_x],[window_y], 0x34EEEeee,,title
mcall 8,<p_start_x,[palette_SIZE_X]>,<p_start_y,[palette_SIZE_Y]>,0x60000002 mcall 8,<p_start_x,[palette_SIZE_X]>,<p_start_y,[palette_SIZE_Y]>,0x60000002
mcall ,<t_start_x,[tone_SIZE_X]>,<t_start_y,[tone_SIZE_Y]>,0x60000003 mcall ,<t_start_x,[tone_SIZE_X]>,<t_start_y,[tone_SIZE_Y]>,0x60000003
mcall ,<c_start_x,c_size_x>,<c_start_y,c_size_y>,0x60000004 mcall ,<296,80>,<280,22>,4,0x37A4D4
mcall ,<402,80>, ,1
mcall 4,<332,289>,0x802C7B9E,OK_Cancel
mcall ,<331,288>,0x80FFFfff
xor ebp,ebp xor ebp,ebp
mcall 65,[palette_area],<[palette_SIZE_X],[palette_SIZE_Y]>,<p_start_x,p_start_y>,24 mcall 65,[palette_area],<[palette_SIZE_X],[palette_SIZE_Y]>,<p_start_x,p_start_y>,24
call draw_tone call draw_tone

7
programs/system/colrdial/i_data.inc
View File

@ -8,10 +8,10 @@ history_text:
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
align 4 align 4
window_x: window_x:
.x_size dw 420 .x_size dw 510
.x_start dw 10 .x_start dw 10
window_y: window_y:
.y_size dw 320 .y_size dw 300
.y_start dw 10 .y_start dw 10
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
;plugins_directory db 'plugins/',0 ;plugins_directory db 'plugins/',0
@ -243,5 +243,6 @@ frame_data:
.font_number dd 0 ;+32 .font_number dd 0 ;+32
.font_size_y dd 9 ;+36 .font_size_y dd 9 ;+36
.font_color dd 0x0 ;+40 .font_color dd 0x0 ;+40
.font_backgr_color dd 0xAABBCC ;+44 .font_backgr_color dd 0xEEEeee ;+44
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
OK_Cancel db 'OK Cancel',0