From d04f47d3351e4f7468b4afd280d62cde6671b9cc Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 4 Dec 2016 16:50:34 +0000
Subject: [PATCH] cmm: bigger menu, Eolite: refrash folder on window redraw,
 fix breadcrumbs click

git-svn-id: svn://kolibrios.org@6782 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/appearance/appearance.c      |  2 +-
 programs/cmm/browser/WebView.c            | 11 +++++++----
 programs/cmm/eolite/Eolite.c              |  1 +
 programs/cmm/eolite/include/breadcrumbs.h |  3 ++-
 programs/cmm/examples/menu.c              |  4 ++--
 programs/cmm/lib/menu.h                   |  6 +++---
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c
index c4887c1a3b..5b56a63bfd 100644
--- a/programs/cmm/appearance/appearance.c
+++ b/programs/cmm/appearance/appearance.c
@@ -71,7 +71,7 @@ void main()
 	  		if (mouse.down)&&(mouse.pkm) {
 	  			select_list.ProcessMouse(mouse.x, mouse.y);
 				SelectList_Draw();
-	  			menu.show(Form.left+mouse.x, Form.top+mouse.y+skin_height, 136, "Open file     Enter\nDelete          Del", 10); 
+	  			menu.show(Form.left+mouse.x, Form.top+mouse.y+skin_height, 185, "Open file     Enter\nDelete          Del", 10); 
 	  		}
 	  		break;
 
diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c
index 1ac9f5e331..e0779b7bf6 100644
--- a/programs/cmm/browser/WebView.c
+++ b/programs/cmm/browser/WebView.c
@@ -136,7 +136,7 @@ void main()
 				{
 					PageLinks.Hover(mouse.x, WB1.list.first*WB1.list.item_h + mouse.y, link_color_inactive, link_color_active, bg_color);
 					if (bufsize) && (mouse.pkm) && (mouse.up) {
-						menu.show(Form.left+mouse.x-6,Form.top+mouse.y+skin_height+3, 180, #rmb_menu, VIEW_SOURCE);
+						EventShowMenu(mouse.x, mouse.y);
 						break;
 					}
 					if (WB1.list.MouseScroll(mouse.vert)) WB1.DrawPage();
@@ -342,9 +342,7 @@ void ProcessEvent(dword id__)
 			else OpenPage();
 			return;
 		case SANDWICH_BUTTON:
-			mouse.y = TOOLBAR_H-6;
-			mouse.x = Form.cwidth - 167;
-			menu.show(Form.left+mouse.x-6,Form.top+mouse.y+skin_height+3, 180, #rmb_menu, VIEW_SOURCE);
+			EventShowMenu(Form.cwidth - 215, TOOLBAR_H-6);
 			return;
 		case VIEW_SOURCE:
 			WB1.list.first = 0;
@@ -576,4 +574,9 @@ void ClickLink()
 	OpenPage();
 }
 
+void EventShowMenu(dword _left, _top)
+{
+	menu.show(Form.left+_left-6,Form.top+_top+skin_height+3, 220, #rmb_menu, VIEW_SOURCE);
+}
+
 stop:
\ No newline at end of file
diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 5f97ed9f07..5b6e395c6d 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -542,6 +542,7 @@ void draw_window()
 	llist_copy(#files_active, #files);
 	strcpy(#active_path, #path);
 	DrawStatusBar();
+	Open_Dir(#path,ONLY_OPEN);
 	DrawFilePanels();
 	if (del_active) Del_Form();
 	if (new_element_active) NewElement_Form(new_element_active, #new_element_name);
diff --git a/programs/cmm/eolite/include/breadcrumbs.h b/programs/cmm/eolite/include/breadcrumbs.h
index 80a9efb130..2fbab9f3b8 100644
--- a/programs/cmm/eolite/include/breadcrumbs.h
+++ b/programs/cmm/eolite/include/breadcrumbs.h
@@ -28,6 +28,7 @@ void DrawBreadCrumbs()
 			breadCrumb.add(i+1);
 		}
 	}
+	breadCrumb.add(i+1);
 	btn.set_size(246,10,NULL,20);
 	area_w = Form.cwidth - btn.x - 20;
 	for (i=0; i<breadCrumb.count-1; i++)
@@ -50,7 +51,7 @@ void ClickOnBreadCrumb(unsigned clickid)
 	for (i=0; i!=clickid+2; i++) {
 		slashpos=strchr(slashpos,'/')+1;
 	}
-	ESBYTE[slashpos] = NULL;
+	ESBYTE[slashpos-1] = NULL;
 	Open_Dir(#path,WITH_REDRAW);
 }
 
diff --git a/programs/cmm/examples/menu.c b/programs/cmm/examples/menu.c
index 3c8b84f52b..65edefbf6d 100644
--- a/programs/cmm/examples/menu.c
+++ b/programs/cmm/examples/menu.c
@@ -43,11 +43,11 @@ void main()
 		if (id==1) ExitProcess();
 		if (id==butv.id) {
 			menu.selected = category+1;
-			menu.show(Form.left+5 + butv.x, Form.top+skin_height + butv.y + butv.h, 100, #vegetables, butv.id);
+			menu.show(Form.left+5 + butv.x, Form.top+skin_height + butv.y + butv.h, 140, #vegetables, butv.id);
 		}
 		if (id==buta.id) {
 			menu.selected = 0;
-			menu.show(Form.left+5 + buta.x, Form.top+skin_height + buta.y + buta.h, 120,    #animals, buta.id);
+			menu.show(Form.left+5 + buta.x, Form.top+skin_height + buta.y + buta.h, 140,    #animals, buta.id);
 		}
 		break;
 
diff --git a/programs/cmm/lib/menu.h b/programs/cmm/lib/menu.h
index b1e8f01f0f..b6f38a993d 100644
--- a/programs/cmm/lib/menu.h
+++ b/programs/cmm/lib/menu.h
@@ -18,7 +18,7 @@ void _menu::show(dword _appear_x, _appear_y, _menu_width, _text, _identifier)
 	list.cur_y = -1;
 	list.ClearList();
 	list.count = chrnum(text, '\n')+1;
-	list.SetSizes(2,2,_menu_width,list.count*19,19);
+	list.SetSizes(2,2,_menu_width,list.count*24,24);
 
 	CreateThread(#_menu_thread,#stak+4092);
 }
@@ -57,8 +57,8 @@ void _menu_draw_list()
 		if (N==menu.list.cur_y) bgcol=0xFFFfff; else bgcol=0xE4DFE1;
 		DrawBar(menu.list.x, N*menu.list.item_h+menu.list.y, menu.list.w-3, menu.list.item_h, bgcol);
 	}
-	WriteTextLines(13, menu.list.item_h-8/2+menu.list.y, 0x80, 0, menu.text, menu.list.item_h);
-	if (menu.selected) WriteText(5, menu.selected-1*menu.list.item_h+7, 0x80, 0xEE0000, "\x10");
+	WriteTextLines(13, menu.list.item_h-12/2+menu.list.y, 0x90, 0, menu.text, menu.list.item_h);
+	if (menu.selected) WriteText(5, menu.selected-1*menu.list.item_h+11, 0x80, 0xEE0000, "\x10");
 }
 
 void _menu_item_click()