KolibriOS/kolibrios
13
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

planet_v use check_box2

Browse Source 
git-svn-id: svn://kolibrios.org@3175 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA 2013-01-16 21:53:50 +00:00
parent e6976fc326
commit b9b90b4740
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/other/planet_v/pl_import.inc
View File

@ -7,6 +7,7 @@ boxlib_import:
edit_box_mouse dd aEdit_box_mouse
; version_ed dd aVersion_ed
init_checkbox dd aInit_checkbox
check_box_draw dd aCheck_box_draw
check_box_mouse dd aCheck_box_mouse
; version_ch dd aVersion_ch
@ -53,8 +54,9 @@ boxlib_import:
aEdit_box_mouse db 'edit_box_mouse',0
; aVersion_ed db 'version_ed',0
aCheck_box_draw db 'check_box_draw',0
aCheck_box_mouse db 'check_box_mouse',0
aInit_checkbox db 'init_checkbox2',0
aCheck_box_draw db 'check_box_draw2',0
aCheck_box_mouse db 'check_box_mouse2',0
; aVersion_ch db 'version_ch',0
; aOption_box_draw db 'option_box_draw',0

15
programs/other/planet_v/planet_v.asm
View File

@ -157,12 +157,13 @@ start:
m2m dword[tree2.data_img],dword[tree_nod_icon]
@@:
mcall 40,0x27
mcall 40,0x27 ;¬ áª  á¨á⥬­ëå ᮡë⨩
init_checkboxes2 ch1,checkboxes_end
mcall 48,3,sc,sizeof.system_colors
;ãáâ ­®¢ª  á¨á⥬­ëå 梥⮢
edit_boxes_set_sys_color edit1,editboxes_end,sc
check_boxes_set_sys_color ch1,checkboxes_end,sc
check_boxes_set_sys_color2 ch1,checkboxes_end,sc
mov byte[file_name],0
@ -877,12 +878,12 @@ fun_opn_dlg: ;
txt142 db '‚ë¡®à ¬¥âª¨',0
; check_boxes
ch1 check_box 5, 5, 6, 12, 0xffffd0, 0x800000, 0, ch_text1, 12,ch_flag_en
ch2 check_box 5, 20, 6, 12, 0xffffd0, 0x800000, 0, ch_text2, 11,ch_flag_en
ch1 check_box2 (5 shl 16)+12, (5 shl 16)+12, 6, 0xffffd0, 0x800000, 0, ch_text1, ch_flag_en
ch2 check_box2 (5 shl 16)+12, (20 shl 16)+12, 6, 0xffffd0, 0x800000, 0, ch_text2, ch_flag_en
checkboxes_end:
ch_text1 db '¡à âì ᢥàåã'
ch_text2 db '¡à âì á­¨§ã'
ch_text1 db '¡à âì ᢥàåã',0
ch_text2 db '¡à âì á­¨§ã',0
edit1 edit_box 190, 215, 10, 0xd0ffff, 0xff, 0x80ff, 0, 0xa000, 4090, openfile_path, mouse_dd, 0
edit2 edit_box 100, 370, 240, 0xd0ffff, 0xff, 0x80ff, 0, 0xa000, 30, ed_buffer.2, mouse_dd, 0
@ -1028,7 +1029,7 @@ align 4
ret ;¢¥à­ãâìáï ç¥­ì ¨­â¥à¥á­ë© 室 â.ª. ¯®ª  ¢ á⥪¥ åà ­¨âìáï ª®«-¢® ¢ë§®¢®¢ â® á⮫쪮 à § ¬ë ¨ ¡ã¤¥¬ ¢ë§ë¢ âìáï
hed db 'Planet viewer 24.08.10',0 ;¯®¤¯¨áì ®ª­ 
hed db 'Planet viewer 16.01.13',0 ;¯®¤¯¨áì ®ª­ 
sc system_colors ;á¨á⥬­ë¥ 梥â 
mouse_dd dd 0 ;­ã¦­® ¤«ï Shift-  ¢ editbox

6
programs/other/planet_v/tile_fun.inc
View File

@ -638,8 +638,7 @@ proc load_tile, tile:dword
; cmp tile_err_f,6
; je @f
mov tile_drobn,0
mov eax,ch2 ;¯à®¢¥à塞 ®¯æ¨î '¡à âì á­¨§ã'
bt dword[eax+32],1 ;ch_flags equ [edi+32] ;ä« £¨
bt dword[ch2.flags],1 ;¯à®¢¥à塞 ®¯æ¨î '¡à âì á­¨§ã'
jae .opt_drobn_false
;¥á«¨ ä ©« ­¥ ­ ©¤¥­, ¯®¯ ¤ ¥¬ á
@ -724,8 +723,7 @@ proc load_tile, tile:dword
.opt_drobn_false:
mov eax,ch1 ;¯à®¢¥à塞 ®¯æ¨î '¡à âì ᢥàåã'
bt dword[eax+32],1 ;ch_flags equ [edi+32] ;ä« £¨
bt dword[ch1.flags],1 ;¯à®¢¥à塞 ®¯æ¨î '¡à âì ᢥàåã'
jae @f
cmp tile_drobn,FRACT_TILE_ALL ;¥á«¨ ᮡ࠭  ¢áï ª à⨭ª , ⮠ᢥàåã 㦥 ­¥ ¡¥à¥¬
je @f