Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 6086 → Rev 6087

/programs/other/t_edit/t_draw.inc
123,32 → 123,22
; edi = pointer to tedit struct
align 4
proc draw_panel_find
;push edi
;mov edi,dword[edit]
cmp ted_panel_id,TED_PANEL_FIND ;if not panel
jne @f
push eax ebx ecx edx
 
mov eax,13 ;ðèñîâàíèå ïðÿìîóãîëüíèêà
mov ebx,TED_PANEL_WIDTH
mov ecx,ted_wnd_t
shl ecx,16
mov cx,20
mov edx,[sc.work]
int 0x40
mcall SF_DRAW_RECT,TED_PANEL_WIDTH,,[sc.work]
 
mov eax,4 ;ðèñîâàíèå òåêñòà
mov ebx,30*65536+25
add ebx,ted_wnd_t
mov ecx,[sc.work_text]
or ecx,0x80000000
mov edx,txtFindCapt
int 0x40
mcall SF_DRAW_TEXT,,,txtFindCapt
 
stdcall [edit_box_draw], dword edit2
stdcall [edit_box_draw], edit2
 
mov eax,13 ;ðèñîâàíèå ïðÿìîóãîëüíèêà
mov ebx,TED_PANEL_WIDTH
mov ecx,ted_wnd_t
add cx,20+15 ; 15 - height text box
shl ecx,16
156,38 → 146,28
mov edx,ted_scr_h
add cx,word[edx+sb_offs_size_y]
sub cx,20+15-1 ; 15 - height text box
mov edx,[sc.work]
int 0x40
mcall SF_DRAW_RECT,TED_PANEL_WIDTH,,[sc.work]
 
mov eax,8 ;êíîïêà
mov ebx,5*65536+85
mov ecx,ted_wnd_t
add cx,20+15+5
shl ecx,16
mov cx,20
mov edx,201 ;button id
mov esi,[sc.work_button]
int 0x40
mcall SF_DEFINE_BUTTON,5*65536+85,,201,[sc.work_button] ;201 - button id
 
mov eax,4 ;ðèñîâàíèå òåêñòà
mov ebx,15*65536+(20+15+10)
add ebx,ted_wnd_t
mov ecx,[sc.work_text]
or ecx,0x80000000
mov edx,txtFindNext
int 0x40
 
mcall SF_DRAW_TEXT,,,txtFindNext
pop edx ecx ebx eax
jmp .end_f
@@:
push eax edx
mov eax,8
mov edx,201
or edx,0x80000000
int 0x40
mcall SF_DEFINE_BUTTON
pop edx eax
.end_f:
;pop edi
ret
endp
 
195,19 → 175,14
; edi = pointer to tedit struct
align 4
proc draw_panel_syntax
;push edi
;mov edi,dword[edit]
cmp ted_panel_id,TED_PANEL_SYNTAX ;if not panel
jne @f
pushad
 
mov eax,13 ;ðèñîâàíèå ïðÿìîóãîëüíèêà
mov ebx,TED_PANEL_WIDTH
mov ecx,ted_wnd_t
shl ecx,16
mov cx,20
mov edx,[sc.work]
int 0x40 ;ðèñîâàíèå âåðõíåãî ôîíîâîãî ïðÿìîóãîëüíèêà
mcall SF_DRAW_RECT,TED_PANEL_WIDTH,,[sc.work] ;ðèñîâàíèå âåðõíåãî ôîíîâîãî ïðÿìîóãîëüíèêà
 
stdcall dword[tl_draw], tree1
mov [ws_dir_lbox.all_redraw],1 ;äëÿ ïîëíîé ïåðåðèñîâêè äî÷åðíåãî ñêðîëëèíãà
226,42 → 201,33
inc cx
int 0x40 ;ðèñîâàíèå íèæíåãî ôîíîâîãî ïðÿìîóãîëüíèêà
 
mov eax,8 ;êíîïêà
mov ebx,5*65536+65
mov ecx,ted_wnd_t
add ecx,25
add ecx,dword[tree1.box_height]
shl ecx,16
mov cx,20
mov edx,200 ;button id
mov esi,[sc.work_button]
int 0x40
mcall SF_DEFINE_BUTTON,(5 shl 16)+65,,200,[sc.work_button] ;200 - button id
 
mov eax,4 ;ðèñîâàíèå òåêñòà
mov ebx,30*65536+5
mov ebx,(30 shl 16)+5
add ebx,ted_wnd_t
mov ecx,[sc.work_text]
or ecx,0x80000000
mov edx,txtFormatCapt
int 0x40
mcall SF_DRAW_TEXT,,,txtFormatCapt
 
mov ebx,10*65536+31
mov ebx,(10 shl 16)+31
add ebx,dword[tree1.box_height]
add ebx,ted_wnd_t
mov edx,txtFormatApply
int 0x40
mcall ,,,txtFormatApply
 
popad
jmp .end_f
@@:
push eax edx
mov eax,8
mov edx,200
or edx,0x80000000
int 0x40 ;åñëè íåò ïàíåëè òî óäàëÿåì êíîïêó
mcall SF_DEFINE_BUTTON ;åñëè íåò ïàíåëè òî óäàëÿåì êíîïêó
pop edx eax
.end_f:
;pop edi
ret
endp
 
277,8 → 243,7
m2m ted_wnd_w,[procinfo.client_box.width] ;ñòàâèì øèðèíó îêíà ðåäàêòîðà ðàâíîé øèðèíå âñåãî îêíà
mov eax,ted_wnd_l
sub ted_wnd_w,eax ;îòíèìàåì îòñòóï ñëåâà
mov eax,dword[esi+sb_offs_size_x]
and eax,0xffff
movzx eax,word[esi+sb_offs_size_x]
sub ted_wnd_w,eax ;îòíèìàåì øèðèíó âåðò. ñêðîëëèíãà
 
m2m ted_wnd_h,[procinfo.client_box.height] ;ñòàâèì âûñîòó îêíà ðåäàêòîðà ðàâíîé âûñîòå âñåãî îêíà
287,8 → 252,7
mov ted_wnd_h,MIN_M_WND_H
@@:
 
mov ax,word[ebx+sb_offs_size_y]
and eax,0xffff
movzx eax,word[ebx+sb_offs_size_y]
sub ted_wnd_h,eax ;îòíèìàåì âûñîòó ãîðèç. ñêðîëëèíãà
mov eax,ted_wnd_t
sub ted_wnd_h,eax ;îòíèìàåì îòñòóï ñâåðõó
300,7 → 264,7
mov tl_box_top,eax ;=ted_wnd_t
add tl_box_top,20
 
mov dword[edit2.top],eax ;=ted_wnd_t
mov [edit2.top],eax ;=ted_wnd_t
add dword[edit2.top],20
 
popad
314,7 → 278,7
draw_but_icon:
push eax ebx
 
mov eax,8 ;êíîïêà
mov eax,SF_DEFINE_BUTTON
push ecx edx esi
mov ebx,edx
mov edx,ecx
330,11 → 294,11
jge @f ;êíîïêà íå âëåçëà â îêíî
mov esi,[sc.work_button]
int 0x40 ;ñòàâèì êíîïêó
mov eax,7 ;bmp
mov eax,SF_PUT_IMAGE
@@:
pop esi edx ecx
 
cmp eax,7
cmp eax,SF_PUT_IMAGE
jne @f ;êíîïêà íå âëåçëà â îêíî
mov ebx,[bmp_icon]
bt ecx,30 ;if (ecx & 0x40000000)