Small bugfix for r.1624

git-svn-id: svn://kolibrios.org@1651 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Marat Zakiyanov (Mario79) 2010-10-11 09:50:01 +00:00
parent 419ecb7f3d
commit 93ace30f65

View File

@ -128,71 +128,73 @@ finddlg_handler:
@@: ret @@: ret
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
osdlg_handler: osdlg_handler:
cmp [bot_mode2], 2
je @f
mov [open_dialog],1 mov [open_dialog],1
ret ret
@@:
cmp al,1
je .draw
cmp al,2
je .key
cmp al,3
je botdlg.button
ret
; cmp al,1 .draw:
; je .draw mov ebx,[bot_ofs]
; cmp al,2 add ebx,(1+3)*65536+6
; je .key mcall 4,,[sc.work_text],s_2filename,s_2filename.size
; cmp al,3 mov ebx,[p_info.client_box.width]
; je botdlg.button shl ebx,16
; ret mov ecx,[bot_ofs]
shl ecx,16
add ecx,(2+18)*65536+15
; .draw: push 20002
; mov ebx,[bot_ofs] cmp [bot_mode2],0
; add ebx,(1+3)*65536+6 jne .draw.lp1
; mcall 4,,[sc.work_text],s_2filename,s_2filename.size add ebx,-(2+6*(s_2open.size+2))*65536+6*(s_2open.size+2)
; mov ebx,[p_info.client_box.width] push s_2open s_2open.size
; shl ebx,16 jmp @f
; mov ecx,[bot_ofs] .draw.lp1:
; shl ecx,16 add ebx,-(2+6*(s_2save.size+2))*65536+6*(s_2save.size+2)
; add ecx,(2+18)*65536+15 push s_2save s_2save.size
;
; push 20002
; cmp [bot_mode2],0
; jne .draw.lp1
; add ebx,-(2+6*(s_2open.size+2))*65536+6*(s_2open.size+2)
; push s_2open s_2open.size
; jmp @f
; .draw.lp1:
; add ebx,-(2+6*(s_2save.size+2))*65536+6*(s_2save.size+2)
; push s_2save s_2save.size
; @@: call define_3d_button @@: call define_3d_button
; sub ebx,(6*(s_2cancel.size+2)+3)*65536 sub ebx,(6*(s_2cancel.size+2)+3)*65536
; mov bx,6*(s_2cancel.size+2) mov bx,6*(s_2cancel.size+2)
; push 20001 s_2cancel s_2cancel.size push 20001 s_2cancel s_2cancel.size
; call define_3d_button call define_3d_button
; cmp [bot_mode2], 2 ; exit-save dialog cmp [bot_mode2], 2 ; exit-save dialog
; jne @f jne @f
; sub ebx,(6*(s_2save_no.size+2)+3)*65536 sub ebx,(6*(s_2save_no.size+2)+3)*65536
; mov bx,6*(s_2save_no.size+2) mov bx,6*(s_2save_no.size+2)
; push 20007 s_2save_no s_2save_no.size push 20007 s_2save_no s_2save_no.size
; call define_3d_button call define_3d_button
; @@: mov ebp,tb_opensave @@: mov ebp,tb_opensave
; mov eax,[p_info.client_box.width] mov eax,[p_info.client_box.width]
; sub eax,6*(s_2filename.size+1)+1 sub eax,6*(s_2filename.size+1)+1
; add eax,6*(s_2filename.size+1)*65536 add eax,6*(s_2filename.size+1)*65536
; mov dword[tbox.width],eax mov dword[tbox.width],eax
; add ecx,-18*65536+1 add ecx,-18*65536+1
; mov dword[tbox.height],ecx mov dword[tbox.height],ecx
; call textbox.draw call textbox.draw
; ret ret
; .key: .key:
; cmp ebx,KEY_ESCAPE cmp ebx,KEY_ESCAPE
; je btn.bot.cancel je btn.bot.cancel
; cmp ebx,KEY_RETURN cmp ebx,KEY_RETURN
; je btn.bot.opensave je btn.bot.opensave
; cmp ebx,KEY_NUMRETURN cmp ebx,KEY_NUMRETURN
; je btn.bot.opensave je btn.bot.opensave
; call textbox.key call textbox.key
; ret ret
;----------------------------------------------------------------------------- ;-----------------------------------------------------------------------------
gotodlg_handler: gotodlg_handler:
cmp al,1 cmp al,1