Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 2125 → Rev 2124

/programs/other/t_edit/t_button.inc
18,7 → 18,7
ends
 
 
hed db 'TextEditor 26.08.11',0 ;¯®¤¯¨áì ®ª­ 
hed db 'TextEditor 22.08.11',0 ;¯®¤¯¨áì ®ª­ 
sc system_colors
 
fn_icon db 'te_icon.bmp',0
230,7 → 230,7
mov ted_panel_id,TED_PANEL_FIND
mov ted_wnd_l,TED_PANEL_WIDTH
.e_if:
call EvSize
stdcall EvSize,edi
stdcall [ted_draw],edi
pop edi
ret
303,7 → 303,7
mov ted_panel_id,TED_PANEL_SYNTAX
mov ted_wnd_l,TED_PANEL_WIDTH
.e_if:
call EvSize
stdcall EvSize,edi
stdcall [ted_draw],edi
pop edi
ret
/programs/other/t_edit/t_edit.asm
194,21 → 194,18
 
align 4
still:
mcall 10
mov eax,10
mcall
 
cmp al,1 ;¨§¬¥­¨«®áì ¯®«®¦¥­¨¥ ®ª­ 
cmp al,1 ;¨§¬. ¯®«®¦¥­¨¥ ®ª­ 
jz red_win
cmp al,2
jz key
cmp al,3
jz button
cmp al,6 ;¬ëèì
jne @f
mcall 9,procinfo,-1
cmp ax,word[procinfo+4]
jne @f ;®ª­® ­¥  ªâ¨¢­®
jmp mouse
@@:
cmp al,6
jz mouse
 
jmp still
 
align 4
215,14 → 212,18
draw_window:
mcall 12,1
 
xor eax,eax
mov ebx,10*65536+485
mov ecx,10*65536+320
mov edx,[sc.work]
or edx,0x73000000
mov edi,hed
mcall 0,(10 shl 16)+485,(10 shl 16)+320
int 0x40
 
mov edi,tedit0
 
mcall 9,procinfo,-1
mov edi,tedit0 ;§­ ç¥­¨¥ edi ­ã¦­® ¤«ï EvSize ¨ ted_wnd_t
call EvSize
stdcall EvSize,edi
 
mov eax,13 ;¢¥àå­¨© ¯àאַ㣮«ì­¨ª, ¤«ï ®ç¨á⪨ ¢¥àå­¥© ¯ ­¥«¨
xor ebx,ebx
289,23 → 290,26
.menu_bar_1:
mov [menu_data_1.get_mouse_flag],1
; mouse event for Menu 1
stdcall [menu_bar_mouse],dword menu_data_1
cmp dword[menu_data_1.click],1
push dword menu_data_1
call [menu_bar_mouse]
cmp [menu_data_1.click],dword 1
jne .mnu_1
cmp dword[menu_data_1.cursor_out],4
cmp [menu_data_1.cursor_out],dword 4
je button.exit
cmp dword[menu_data_1.cursor_out],3
cmp [menu_data_1.cursor_out],dword 3
jne @f
stdcall [ted_but_save_file], tedit0,run_file_70,[edit1.text]
@@:
cmp dword[menu_data_1.cursor_out],2
cmp [menu_data_1.cursor_out],dword 2
jne @f
call ted_but_open_file
@@:
cmp dword[menu_data_1.cursor_out],1
cmp [menu_data_1.cursor_out],dword 1
jne @f
call ted_but_new_file
@@:
;cmp [menu_data_1.cursor_out],dword 0
;jne @f
.mnu_1:
jmp still
;---------------------------------------------------------------------
/programs/other/t_edit/t_draw.inc
260,12 → 260,11
ret
endp
 
MIN_M_WND_H equ 100 ;ìèíèìàëüíàÿ âûñîòà ãëàâíîãî îêíà
;input:
; edi = pointer to tedit struct
MIN_M_WND_H equ 100
align 4
EvSize:
proc EvSize, edit:dword
pushad
mov edi,dword[edit]
mov ebx,ted_scr_h
mov esi,ted_scr_w
 
300,6 → 299,7
 
popad
ret
endp
 
;input:
; ecx = 0x4000____