From 6fc5704c837732f71f5898434d4d30e71aa64211 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 9 Aug 2015 22:26:14 +0000
Subject: [PATCH] Eolite 3.0 beta 5: more GUI flexibility

git-svn-id: svn://kolibrios.org@5703 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/eolite/Eolite.c               |  4 ++--
 programs/cmm/eolite/include/gui.h          | 12 ++++++------
 programs/cmm/eolite/include/left_panel.h   | 15 ++++++++++-----
 programs/cmm/eolite/include/translations.h |  4 ++--
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 1edb9328b6..e572190898 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -538,10 +538,10 @@ void draw_window()
 	}
 	else
 	{
-		files.SetSizes(2, 57+18, Form.cwidth/2-2-17, Form.cheight-59-18, disc_num*16+3,files.line_h);
+		files.SetSizes(2, 57+22, Form.cwidth/2-2-17, Form.cheight-59-22, disc_num*16+3,files.line_h);
 		DrawListColumns();
 		Open_Dir(#path,ONLY_SHOW);		
-		files.SetSizes(Form.cwidth/2, 57+18, Form.cwidth/2-17, Form.cheight-59-18, disc_num*16+3,files.line_h);
+		files.SetSizes(Form.cwidth/2, 57+22, Form.cwidth/2 -17, Form.cheight-59-22, disc_num*16+3,files.line_h);
 		DrawListColumns();
 		Open_Dir(#path,ONLY_SHOW);
 	}
diff --git a/programs/cmm/eolite/include/gui.h b/programs/cmm/eolite/include/gui.h
index 85b51822ae..a3a8ceb1a4 100644
--- a/programs/cmm/eolite/include/gui.h
+++ b/programs/cmm/eolite/include/gui.h
@@ -5,9 +5,9 @@ dword col_palette[14] = {0xD2D3D3,0xD4D4D4,0xD6D5D6,0xD8D7D8,0xDAD8D9,0xDCDADB,
 void Scroll() {
 	dword i;
 
-	word sc_x = Form.cwidth - 18;
-	word sc_y = 57;
-	word sc_h = Form.cheight - 18 - sc_y;
+	word sc_x = files.x + files.w;
+	word sc_y = files.y;
+	word sc_h = files.h - 16;
 	word sc_slider_y;
 
 	if (files.count<=0)
@@ -34,11 +34,11 @@ void Scroll() {
 		DrawBar(sc_x+2, sc_y+1, 14, sc_slider_y-sc_y-1, 0xCED0D0);
 	}
 	//area after slider
-	if (sc_h-sc_slider_h+55>sc_slider_y)
+	if (sc_h-sc_slider_h+sc_y-2>sc_slider_y)
 	{
 		DrawBar(sc_x+1, sc_slider_y + sc_slider_h+1, 15, 1, 0xC7C9C9);
-		DrawBar(sc_x+1, sc_slider_y + sc_slider_h+2,  1, sc_h-sc_slider_h-sc_slider_y+55, 0xC7C9C9);
-		DrawBar(sc_x+2, sc_slider_y + sc_slider_h+2, 14, sc_h-sc_slider_h-sc_slider_y+55, 0xCED0D0);
+		DrawBar(sc_x+1, sc_slider_y + sc_slider_h+2,  1, sc_h-sc_slider_h-sc_slider_y+sc_y-2, 0xC7C9C9);
+		DrawBar(sc_x+2, sc_slider_y + sc_slider_h+2, 14, sc_h-sc_slider_h-sc_slider_y+sc_y-2, 0xCED0D0);
 	}
 }
 
diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h
index 6b58dba668..c94924a482 100644
--- a/programs/cmm/eolite/include/left_panel.h
+++ b/programs/cmm/eolite/include/left_panel.h
@@ -112,7 +112,7 @@ void GetSystemDiscs()
 void DrawSystemDiscs()
 {    
 	char dev_name[15], disc_name[100], i, dev_icon, is_active;
-	int pos_y, pos_x;
+	int pos_y, pos_x=2;
 	
 	for (i=disc_num; i<30; i++) DeleteButton(100+i);
 	for (i=0;i<disc_num;i++)
@@ -180,15 +180,20 @@ void DrawSystemDiscs()
 		}
 		else
 		{
-			pos_y = 41;
-			pos_x = i*80 + files.x;
+			pos_y = 43;
 			DrawBar(pos_x, pos_y, 80, 17, 0xFFFFFF);
-			DefineButton(pos_x, pos_y, 79, 16, 100+i+BT_HIDE,0xFFFFFF);
+			DefineButton(pos_x+2, pos_y, strlen(#dev_name)*6 + 33, 16, 100+i+BT_HIDE,0xFFFFFF);
 			_PutImage(pos_x + 5, pos_y, 18,17, is_active*6+dev_icon*17*18*3+#devices);
 			WriteText(pos_x + 24, pos_y+5, 0x80, 0, #dev_name);
+			pos_x += strlen(#dev_name)*6 + 37;
 		}
 	}
-	if (two_panels) DrawBar(pos_x + 80, pos_y, files.x + files.w - pos_x - 80 + 17, 17, system.color.work);
+	if (two_panels)
+	{
+		DrawBar(pos_x, pos_y, Form.cwidth - pos_x - 2, 17, 0xFFFFFF);
+		DrawBar(2, pos_y-2, Form.cwidth - 4, 2, 0xFFFFFF);
+		DrawBar(2, pos_y+17, Form.cwidth - 4, 2, 0xFFFFFF);
+	}
 }
 
 
diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h
index 7183641d99..cc39d1a4d8 100644
--- a/programs/cmm/eolite/include/translations.h
+++ b/programs/cmm/eolite/include/translations.h
@@ -1,5 +1,5 @@
-#define TITLE "Eolite File Manager v3.0 beta 4"
-#define ABOUT_TITLE "Eolite 3.0 beta 4"
+#define TITLE "Eolite File Manager v3.0 beta 5"
+#define ABOUT_TITLE "Eolite 3.0 beta 5"
 
 #ifdef LANG_RUS
 	?define T_FILE "” ©«"