KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

new style for cursor position in 'tree_list'

Browse Source 
git-svn-id: svn://kolibrios.org@7508 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2018-10-30 13:03:22 +00:00
parent 8a77c84962
commit f14a437031
4 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
programs/develop/libraries/box_lib/trunk/box_lib.mac
View File

@@ -220,8 +220,6 @@ macro check_boxes_set_sys_color2 start,end,color_table
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;Basic macros for use OptionBox ;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -272,6 +270,7 @@ macro option_boxes_set_sys_color color_table,group
cmp edi,0
jne @b
}
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;Basic macros for use TreeList ;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -336,6 +335,7 @@ tl_on_press equ dword[edi+84] ;㪠
tl_key_no_edit equ 1b ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ।<><E0A5A4><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>஢<EFBFBD><E0AEA2>, 㤠<><E3A4A0><EFBFBD><EFBFBD>)
tl_draw_par_line equ 10b ;<3B><>ᮢ<EFBFBD><E1AEA2><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20> த<>⥫<EFBFBD>᪮<EFBFBD><E1AAAE> 㧫<>
tl_list_box_mode equ 100b ;<3B>⨫<EFBFBD> <20><> <20>⮡ࠦ<E2AEA1><E0A0A6><EFBFBD> <20>஢<EFBFBD><E0AEA2> (<28><><EFBFBD> <20> ListBox <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>஢<EFBFBD><E0AEA2>)
tl_cursor_pos_limited equ 8 ;<3B><>६<EFBFBD>饭<EFBFBD><E9A5AD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>࠭<EFBFBD>祭<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>騬<EFBFBD> 㧫<><E3A7AB><EFBFBD>
;<3B><><EFBFBD><EFBFBD>⠭<EFBFBD><E2A0AD> <20><><EFBFBD> <20>㭪権
tl_err_save_memory_size equ 10b ;<3B><> 墠⠥<E5A2A0> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>

18
programs/develop/libraries/box_lib/trunk/tree_list.asm
View File

@@ -266,6 +266,12 @@ pop ebx eax
mov ecx,eax
call tl_get_node_count ;eax = node count
bt tl_style,3 ;tl_cursor_pos_limited
jnc @f
or eax,eax
jz @f
dec eax ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>⠥<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>騥 㧫<>
@@:
cmp eax,ecx
jl @f
mov eax,ecx ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>襫 <20><> <20>।<EFBFBD><E0A5A4><EFBFBD> 㧫<><E3A7AB>, <20><><EFBFBD><EFBFBD>⠭<EFBFBD><E2A0AD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>஥ <20><><EFBFBD>祭<EFBFBD><E7A5AD> eax
@@ -1549,6 +1555,12 @@ align 4
proc tl_cur_next uses eax ebx edi esi, tlist:dword
mov edi,[tlist]
call tl_get_node_count ;eax = node count
bt tl_style,3 ;tl_cursor_pos_limited
jnc @f
or eax,eax
jz @f
dec eax ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>⠥<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>騥 㧫<>
@@:
cmp tl_cur_pos,eax
jge .no_redraw
mov esi,tl_box_top
@@ -1700,6 +1712,12 @@ proc tl_cur_page_down uses eax ebx ecx edi esi, tlist:dword
je .no_redraw
mov esi,tl_p_scroll
call tl_get_node_count ;eax = node count
bt tl_style,3 ;tl_cursor_pos_limited
jnc @f
or eax,eax
jz @f
dec eax ;<3B>᫨ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>⠥<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>騥 㧫<>
@@:
mov ebx,eax
call tl_get_rows_count ;eax = rows count

4
programs/other/cnc_editor/cnc_editor.asm
View File

@@ -14,7 +14,7 @@ include 'cnc_editor.inc'
include '../../develop/info3ds/info_fun_float.inc'
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
caption db 'CNC editor 08.10.18',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
caption db 'CNC editor 30.10.18',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
run_file_70 FileInfoBlock
@@ -711,7 +711,9 @@ but_open_file:
mcall SF_SET_CAPTION,1,openfile_path
;---
and dword[tree1.style],not tl_cursor_pos_limited
stdcall FileInit,[open_file_data],[open_file_size]
or dword[tree1.style], tl_cursor_pos_limited
stdcall [buf2d_clear], buf_0, [buf_0.color] ;<3B><><EFBFBD>⨬ <20><><EFBFBD><EFBFBD><EFBFBD>
stdcall [buf2d_draw], buf_0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 <20><><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>࠭<EFBFBD>
.end_open_file:

1
programs/other/t_edit/t_edit.asm
View File

@@ -177,6 +177,7 @@ mov ebp,lib0
add eax,304
loop @b
stdcall [tl_cur_beg],tree1 ;<3B>⠢<EFBFBD><E2A0A2> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><>砫<EFBFBD> ᯨ᪠
or dword[tree1.style], tl_cursor_pos_limited ;<3B><>࠭<EFBFBD>稢<EFBFBD><E7A8A2><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD> ᯨ᪠
.end_dir_init:
;--- load ini file ---