keXa/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

@icon: display icon number while editing, 4 icon lines

Browse Source 
git-svn-id: svn://kolibrios.org@5439 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2015-02-21 00:49:06 +00:00
parent e3dd106fd0
commit 6943ce01ec
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/system/icon_new/@icon.asm
View File

@ -12,7 +12,7 @@ MIN_NO_MOVING equ 8 ;
ICONSX equ 20 ICONSX equ 20
ICONSY equ 80 ICONSY equ 80
ICONS_DRAW_COUNTW equ 10 ;ª®«¨ç¥á⢮ ¨ª®­®ª ¢ è¨à¨­ã ICONS_DRAW_COUNTW equ 10 ;ª®«¨ç¥á⢮ ¨ª®­®ª ¢ è¨à¨­ã
ICONS_DRAW_COUNTH equ 2 ;ª®«¨ç¥á⢮ ¨ª®­®ª ¢ ¢ëá®âã ICONS_DRAW_COUNTH equ 4 ;ª®«¨ç¥á⢮ ¨ª®­®ª ¢ ¢ëá®âã
SPCW equ 3 ;¯à®¡¥« ¬¥¦¤ã ¨ª®­ª ¬¨ ¯® £®à¨§®­â «¨ SPCW equ 3 ;¯à®¡¥« ¬¥¦¤ã ¨ª®­ª ¬¨ ¯® £®à¨§®­â «¨
SPCH equ 3 SPCH equ 3
END_ICONS_AREAW equ ICONSX+(IMG_SIZE+SPCW)*ICONS_DRAW_COUNTW-SPCW END_ICONS_AREAW equ ICONSX+(IMG_SIZE+SPCW)*ICONS_DRAW_COUNTW-SPCW
@ -1173,8 +1173,8 @@ edtExePath edit_box 281-3-20-IMG_SIZE,70+20+IMG_SIZE,26,0FFFFFFh,06F9480h,0FFh,0
DAreaPath,mouse_dd,0,0,0 DAreaPath,mouse_dd,0,0,0
edtParams edit_box 295-20-IMG_SIZE,70+20+IMG_SIZE,46,0FFFFFFh,06F9480h,0FFh,0h,0,255,\ edtParams edit_box 295-20-IMG_SIZE,70+20+IMG_SIZE,46,0FFFFFFh,06F9480h,0FFh,0h,0,255,\
DAreaParams,mouse_dd,0,0,0 DAreaParams,mouse_dd,0,0,0
edtIcon edit_box 295-20-IMG_SIZE,70+20+IMG_SIZE,66,0FFFFFFh,06F9480h,0FFh,0h,0,255,\ edtIcon edit_box 28,24,50,0FFFFFFh,0FFFFFFh,0FFh,0h,0,3,\
DAreaIcon,mouse_dd,0,0,0 DAreaIcon,0,0,0,0
endEdits: endEdits:
;\ ;\

17
programs/system/icon_new/DlgAdd.inc
View File

@ -195,6 +195,9 @@ DReDraw:
;edit_boxes_set_sys_color edtIcon,endEdits,sc ;edit_boxes_set_sys_color edtIcon,endEdits,sc
edit_boxes_set_sys_color edtName,endEdits,sc edit_boxes_set_sys_color edtName,endEdits,sc
m2m [edtIcon.color],[sc.work]
m2m [edtIcon.blur_border_color],[sc.work]
call DRedrawWin call DRedrawWin
@ -364,13 +367,13 @@ DMouse:
mov dword[edtIcon.size],1 mov dword[edtIcon.size],1
jmp .RedrawNum jmp .RedrawNum
.RedrawNum: .RedrawNum:
; stdcall [edit_box_draw],edtIcon
; need to optimize redraw
; stdcall [edit_box_draw],edtIcon ; call DrawSelIcon
; jmp DMessages
jmp DReDraw
call DrawSelIcon
jmp DReDraw;DMessages;
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
DSetExePath: DSetExePath:
stdcall [OpenDialog_Start],OpenDialog_data stdcall [OpenDialog_Start],OpenDialog_data
@ -457,7 +460,7 @@ proc DRedrawWin
stdcall [edit_box_draw],edtName stdcall [edit_box_draw],edtName
stdcall [edit_box_draw],edtExePath stdcall [edit_box_draw],edtExePath
stdcall [edit_box_draw],edtParams stdcall [edit_box_draw],edtParams
; stdcall [edit_box_draw],edtIcon stdcall [edit_box_draw],edtIcon
call DrawStdIcons call DrawStdIcons