WebSVN – Kolibri OS – Diff – /programs/develop/kol_f_edit/ced_wnd_prop.inc

 align 4
 prop_start:
 pushad
 	mcall 40,0x27 ;¬ áª  ®¦¨¤ ¥¬ëå á®¡ëâ¨©
+	call init_obj_count_txt_props ;¯®«ãç ¥¬ ç¨á«® ¨á¯®«ì§ã¥¬ëå ¯®«¥©
 	;  áâà®©ª  â¥ªáâ®¢ëå ¯®«¥©
 	xor ebx,ebx
 	mov edi,edit2
 	@@:
 	@@:
 	mov eax,dword[icon_tl_sys]
 	mov dword[tree3.data_img_sys],eax
 	mov edx,[foc_obj]
-	cmp byte[edx],C_VAR
+	cmp dword[edx],C_VAR
 	jne .sel_end
 	stdcall [tl_node_poi_get_info], 0,tree2
 		pop esi ;¯®«ãç ¥¬ ¤ ë¥ ã§«
 ;------ ¤®¡ ¢«¥¨¥ ®¡ê¥ªâ  ¢ á¯¨á®ª -------------------------------------------
 		mov ebx,[foc_obj]
 		cmp ebx,esi
 		je .add_end ;¨§¡¥£ ¥¬ æ¨ª«¨ç¥áª®© ááë«ª¨
-		mov bl,[esi]
+		mov ebx,dword[esi]
-		cmp bl,C_TDF
+		cmp ebx,C_TDF
 		je .add_beg
-		cmp bl,C_STR
+		cmp ebx,C_STR
 		je .add_beg
 			jmp .add_end
 		.add_beg:
 			stdcall get_obj_id,esi
 			mov edi,u_object
 			mov dword[edi],eax
 			add edi,4
-			inc esi ;¯¥à¥å®¤¨¬   ¨¬ï ®¡ê¥ªâ
+			add esi,u_object.txt-u_object ;¯¥à¥å®¤¨¬   ¨¬ï ®¡ê¥ªâ
 			mov ecx,MAX_LEN_OBJ_TXT
 			cld
 			rep movsb
 	mov dword[ch3.text],ch_text
 	mov dword[ch4.text],ch_text
 	;ãáâ ®¢ª  ®¢ëå ¯®¤¯¨á¥©
 	mov esi,[foc_obj] ;¡¥à¥¬ ãª § â¥«ì   ®¡ê¥ªâ
-	mov bl,byte[esi]
+	mov ebx,dword[esi]
 	call find_obj_in_opt
 	mov edi,dword[edi+obj_opt.bit_prop-obj_opt]
 	cmp edi,0
 	je .no_bit_capts ;¥á«¨ 1-¥ ¡¨â®¢®¥ á¢®©áâ¢® ¯ãáâ®¥, â® ¢ æ¨ª« ¥ § å®¤¨¬
 	xor eax,eax
 	mov edi,hed
 	mov edx,[foc_obj] ;¡¥à¥¬ ãª § â¥«ì   ®¡ê¥ªâ
 	cmp edx,0
 	je @f
-		mov bl,[edx]
+		mov ebx,dword[edx]
 		call find_obj_in_opt
 		add edi,obj_opt.info-obj_opt ;edi - ¯®¤¯¨áì ( §¢ ¨¥ ®¡ê¥ªâ )
 	@@:
 	mov ebx,30*65536+prop_wnd_width
 	mov ecx,50*65536+250
 		inc ebx
 		inc ecx
 		stdcall draw_icon, 17,ebx,ecx ;17 - save
+		mov edi,edit2
+		mov ecx,[obj_count_txt_props]
-		mov edi,edit2
+		cld
 		.cycle:
-			stdcall [edit_box_draw], edi ;à¨áã¥¬ ¯®«ï á® á¢®©áâ¢ ¬¨ ®¡ê¥ªâ
+			stdcall [edit_box_draw], edi
-			add edi,ed_struc_size
-			cmp edi,prop_wnd_edits_end
+			add edi,ed_struc_size
-		jl .cycle
+		loop .cycle
 		cmp [err_ini0],1
 		je .exit_fun
 			inc ebx
 			cmp ebx,MAX_OPT_FIELDS
 			jl .draw_column
-		cmp byte[edx],C_VAR
+		cmp dword[edx],C_VAR
 		jne .no_tree
 			mov dword[w_scr_t3.all_redraw],1
 	.exit_fun:
 	mcall 12,2
+popad
 popad
 ;¥ ®âàë¢ âì íâã äãªæ¨î ®â ¯à¥¤ë¤ãé¥©
 align 4
 prop_still:
 		call prop_mouse
 	@@:
 	popad
 	jmp prop_still
+;¢ æ¨ª«¥ ¯à®¡¥£ ¥¬ ¯® ¢á¥¬ ¯®«ï¬ á® á¢®©áâ¢ ¬¨,
+;çâ®-¡ë ¯®áç¨â âì ç¨á«® ¨á¯®«ì§ã¥¬ëå ¯®«¥©
+align 4
+init_obj_count_txt_props:
+pushad
+	mov edx,[foc_obj] ;¡¥à¥¬ ãª § â¥«ì   ®¡ê¥ªâ
+	xor ebx,ebx
+	mov edi,edit2
+	.cycle:
+		stdcall get_obj_text_len_col, edx,ebx ;eax - ¤«¨  ¯®«ï
+		cmp eax,1
+		jl @f ;¢ëå®¤ ¨§ æ¨ª«  ¥á«¨ ¯®«¥ ¥ ¨á¯®«ì§ã¥âìáï
+		inc ebx
+		add edi,ed_struc_size
+		cmp edi,prop_wnd_edits_end
+		jl .cycle
+	@@:
+	mov [obj_count_txt_props],ebx
+popad
+	ret
+;¢ë¢®¤ â¥ªáâ®¢ëå ¯®¤¯¨á¥© ¤«ï ¯®«¥© á® á¢®©áâ¢ ¬¨
+align 4
+proc draw_obj_caption, o_type:dword,n_col:dword, coord_y:dword
+	pushad
+	stdcall get_obj_text_len_col, [foc_obj], [n_col] ;eax - ¤«¨  ¯®«ï
+	cmp eax,1
+	jl .no_draw
+	xor ebx,ebx
+	mov ebx,dword[o_type]
+	call find_obj_in_opt
+	mov edx,edi
+	add edx,obj_opt.caption-obj_opt
+	mov eax,[n_col]
+	mov ebx,143 ;®âáâã¯ á«¥¢
+	shl ebx,16
+	add ebx,dword[coord_y]
+	add ebx,3
+	mov ecx,0 ;text color
+	mov esi,edx
+	.beg_found:
+		cmp byte[esi],0
+		je .end_found
+		cmp byte[esi],'*'
+		je @f
+		inc esi
+		jmp .beg_found
+	@@:
+	cmp eax,0
+	je .end_found
+		dec eax
+		inc esi
+		mov edx,esi ;¯¥à¥ª«îç ¥¬  ç «® áâà®ª¨   á«¥¤. ¯®¤¯¨áì
+		jmp .beg_found
+	.end_found:
+	cmp esi,edx
+	jle .no_draw
+		sub esi,edx ;esi = text len
+		mov eax,4
+		int 0x40
+	.no_draw:
+	popad
+	ret
+endp
+align 4
+proc set_obj_win_param, col:dword, edit:dword
+	pushad
+		stdcall get_obj_text_col, [foc_obj], [col] ;edx - text
+		stdcall get_obj_text_len_col, [foc_obj], [col] ;eax - ¤«¨  ¯®«ï
+		mov edi,[edit]
+		cmp eax,1
+		jl @f
+			dec eax
+			mov ed_max,eax ;ed_max = edi+.max
+			mov ed_focus_border_color, dword 0xff
+			mov ed_blur_border_color, dword 0x808080
+			stdcall [edit_box_set_text], edi,edx ;®¡®¢«ï¥¬ editbox
+			jmp .end_f
+		@@:
+			mov ed_max,dword MAX_LEN_OBJ_TXT
+			;stdcall [edit_box_set_text], edi,txt_null
+		.end_f:
+	popad
+	ret
+endp
 align 4
 prop_key:
-push eax edi
+push eax ecx edi
 	mcall 2
+	mov edi,edit2
+	mov ecx,[obj_count_txt_props]
-	mov edi,edit2
+	cld
 	.cycle:
 		stdcall [edit_box_key], edi
-		add edi,ed_struc_size
-		cmp edi,prop_wnd_edits_end
+		add edi,ed_struc_size
-		jl .cycle
+	loop .cycle
-	mov edi,[foc_obj]
+	mov edi,dword[foc_obj]
-	cmp byte[edi],C_VAR
+	cmp dword[edi],C_VAR
 	jne @f
 		stdcall [tl_key], tree3
 	@@:
-pop edi eax
+pop edi ecx eax
 	ret
 align 4
+prop_mouse:
+	push ecx edi
-prop_mouse:
+	mov edi,edit2
-	push edi
+	mov ecx,[obj_count_txt_props]
-	mov edi,edit2
+	cld
-	.cycle:
-		stdcall [edit_box_mouse], edi
+	.cycle:
-		add edi,ed_struc_size
+		stdcall [edit_box_mouse], edi
-		cmp edi,prop_wnd_edits_end
+		add edi,ed_struc_size
-		jl .cycle
+	loop .cycle
-	mov edi,[foc_obj]
+	mov edi,dword[foc_obj]
-	cmp byte[edi],C_VAR
+	cmp dword[edi],C_VAR
-	jne @f
-		stdcall [tl_mouse], tree3
+	jne @f
-	@@:
+		stdcall [tl_mouse], tree3
 	@@:
 	checkboxes_mouse2 check_boxes,check_boxes_end
 	checkboxes_mouse2 check_boxes,check_boxes_end

Subversion Repositories Kolibri OS

(root)/programs/develop/kol_f_edit/ced_wnd_prop.inc – Rev 1714 → 1717