From 6943ce01ec3f4343bf4471ebb9427ab04408fb39 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sat, 21 Feb 2015 00:49:06 +0000
Subject: [PATCH] @icon: display icon number while editing, 4 icon lines

git-svn-id: svn://kolibrios.org@5439 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/system/icon_new/@icon.asm  |  6 +++---
 programs/system/icon_new/DlgAdd.inc | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/programs/system/icon_new/@icon.asm b/programs/system/icon_new/@icon.asm
index 6f38ae09f8..eb048a5f1e 100644
--- a/programs/system/icon_new/@icon.asm
+++ b/programs/system/icon_new/@icon.asm
@@ -12,7 +12,7 @@ MIN_NO_MOVING	equ 8	 ;
 ICONSX		equ 20
 ICONSY		equ 80
 ICONS_DRAW_COUNTW equ 10  ;количество иконок в ширину
-ICONS_DRAW_COUNTH equ 2   ;количество иконок в высоту
+ICONS_DRAW_COUNTH equ 4   ;количество иконок в высоту
 SPCW		equ 3	  ;пробел между иконками по горизонтали
 SPCH		equ 3
 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
 edtParams  edit_box 295-20-IMG_SIZE,70+20+IMG_SIZE,46,0FFFFFFh,06F9480h,0FFh,0h,0,255,\
 		DAreaParams,mouse_dd,0,0,0
-edtIcon    edit_box 295-20-IMG_SIZE,70+20+IMG_SIZE,66,0FFFFFFh,06F9480h,0FFh,0h,0,255,\
-		DAreaIcon,mouse_dd,0,0,0
+edtIcon    edit_box 28,24,50,0FFFFFFh,0FFFFFFh,0FFh,0h,0,3,\
+		DAreaIcon,0,0,0,0
 endEdits:
 ;\
 
diff --git a/programs/system/icon_new/DlgAdd.inc b/programs/system/icon_new/DlgAdd.inc
index a6b819a6e2..738e88bb99 100644
--- a/programs/system/icon_new/DlgAdd.inc
+++ b/programs/system/icon_new/DlgAdd.inc
@@ -195,6 +195,9 @@ DReDraw:
 
 	;edit_boxes_set_sys_color edtIcon,endEdits,sc
 	edit_boxes_set_sys_color edtName,endEdits,sc
+	
+	m2m	[edtIcon.color],[sc.work]
+	m2m	[edtIcon.blur_border_color],[sc.work]
 
 	call	DRedrawWin
 
@@ -364,13 +367,13 @@ DMouse:
 	mov	dword[edtIcon.size],1
 	jmp	.RedrawNum
     .RedrawNum:
+	
+    ; stdcall [edit_box_draw],edtIcon
 
-
-      ;  stdcall [edit_box_draw],edtIcon
-
-
-	call	DrawSelIcon
-	jmp	DReDraw;DMessages;
+	; need to optimize redraw
+	; call	DrawSelIcon
+	; jmp	DMessages
+	jmp	DReDraw
 ;-------------------------------------------------------------------------------
 DSetExePath:
 	stdcall [OpenDialog_Start],OpenDialog_data
@@ -457,7 +460,7 @@ proc DRedrawWin
 	stdcall [edit_box_draw],edtName
 	stdcall [edit_box_draw],edtExePath
 	stdcall [edit_box_draw],edtParams
-;        stdcall [edit_box_draw],edtIcon
+    stdcall [edit_box_draw],edtIcon
 
 	call	DrawStdIcons