From 81e648fa3ab0b616af2a83d90e13ed611e6d2e36 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Sun, 16 Sep 2018 22:30:13 +0000
Subject: [PATCH] Eolite 3.93: fix bigs related to big icons and two pannels
 mode

git-svn-id: svn://kolibrios.org@7375 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 programs/cmm/eolite/Eolite.c               | 22 +++++++++++-----------
 programs/cmm/eolite/include/settings.h     | 15 ++++++++++-----
 programs/cmm/eolite/include/translations.h |  4 ++--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c
index 4144643943..fbc81ca82d 100644
--- a/programs/cmm/eolite/Eolite.c
+++ b/programs/cmm/eolite/Eolite.c
@@ -133,7 +133,7 @@ byte cmd_free=0;
 
 void main() 
 {
-	byte update = 0;
+	bool update_files_list = false;
 	dword files_count = 0;
 	dword countPathFile = 0;
 	dword countPathFile2 = 0;
@@ -153,9 +153,9 @@ void main()
 	load_dll(libio,  #libio_init,1);
 	load_dll(libimg, #libimg_init,1);
 	
+	SetAppColors();
 	LoadIniSettings();
 	SystemDiscs.Get();
-	SetAppColors();
 
 	Libimg_LoadImage(#icons16_default, "/sys/icons16.png");
 	Libimg_LoadImage(#icons16_selected, "/sys/icons16.png");
@@ -541,7 +541,7 @@ void main()
 			default:
 				
 				ReadDir(19, devbuf, "/"); // get disk
-				IF(countDisk != EBX) // if different then
+				if(countDisk != EBX) // if different then
 				{
 					countDisk = EBX;
 					FnProcess(5);
@@ -551,28 +551,28 @@ void main()
 					if(two_panels.checked)
 					{
 						// this add code update list files
-						update = 0;
+						update_files_list = false;
 						//strcpy(#inactive_path,#path);
 						ReadDir(19, devbuf, #inactive_path);
-						IF(countPathFile != EBX) // if different then
+						if(countPathFile != EBX) // if different then
 						{
 							countPathFile = EBX;
-							update = 0xFF;
+							update_files_list = true;
 						}
 						
 						//strcpy(#active_path,#path);
 						ReadDir(19, devbuf, #active_path);
-						IF(countPathFile2 != EBX) // if different then
+						if(countPathFile2 != EBX) // if different then
 						{
 							countPathFile2 = EBX;
-							update = 0xFF;
+							update_files_list = true;
 						}
-						IF(update) DrawFilePanels();
+						if(update_files_list) DrawFilePanels();
 					}
-					ELSE
+					else
 					{
 						ReadDir(19, devbuf, #path);
-						IF(countPathFile != EBX) // if different then
+						if(countPathFile != EBX) // if different then
 						{
 							countPathFile = EBX;
 							Open_Dir(#path,WITH_REDRAW);
diff --git a/programs/cmm/eolite/include/settings.h b/programs/cmm/eolite/include/settings.h
index d4832bd432..b7e2e79c59 100644
--- a/programs/cmm/eolite/include/settings.h
+++ b/programs/cmm/eolite/include/settings.h
@@ -93,7 +93,7 @@ void settings_dialog()
 					kfont.changeSIZE(); 
 					BigFontsChange(); 
 				}
-				if (line_height.click(id)) files.item_h = line_height.value; 
+				if (line_height.click(id)) files.item_h = files_inactive.item_h = line_height.value; 
 				if (big_icons.click(id)) BigIconsSwitch();
 				EventRedrawWindow(Form.left,Form.top);
 				//RefreshWindow(Form.slot, Settings.slot);
@@ -159,6 +159,7 @@ void LoadIniSettings()
 	show_dev_name.checked   = ini.GetInt("ShowDeviceName", true); 
 	show_status_bar.checked = ini.GetInt("ShowStatusBar", true); 
 	info_after_copy.checked = ini.GetInt("InfoAfterCopy", false); 
+	big_icons.checked       = ini.GetInt("BigIcons", false); BigIconsSwitch();
 	two_panels.checked      = ini.GetInt("TwoPanels", false); 
 	kfont.size.pt   = ini.GetInt("FontSize", 13); 
 	files.item_h    = ini.GetInt("LineHeight", 19);
@@ -184,6 +185,7 @@ void SaveIniSettings()
 	ini.SetInt("RealFileNamesCase", show_real_names.checked);
 	ini.SetInt("InfoAfterCopy", info_after_copy.checked);
 	ini.SetInt("FontSize", kfont.size.pt);
+	ini.SetInt("BigIcons", big_icons.checked);
 	ini.SetInt("TwoPanels", two_panels.checked);
 	ini.SetInt("LineHeight", files.item_h);
 	ini.SetInt("WinX", Form.left);
@@ -224,7 +226,11 @@ void SetAppColors()
 void BigFontsChange()
 {
 	files.item_h = kfont.size.pt + 4;
-	if (files.item_h<18) files.item_h = 18;
+	if (files.item_h<icon_size+3) {
+		files.item_h = icon_size+3;
+		line_height.value = files.item_h;
+		line_height.redraw();
+	}
 	files_active.item_h = files_inactive.item_h = files.item_h;
 }
 
@@ -233,7 +239,6 @@ void BigIconsSwitch()
 	if (big_icons.checked) 
 	{
 		icon_size=32;
-		files.item_h = line_height.value = 35;
 		if (!icons32_default.image)
 		{
 			Libimg_LoadImage(#icons32_default, "/sys/icons32.png");
@@ -246,6 +251,6 @@ void BigIconsSwitch()
 	}
 	else {
 		icon_size=16; 
-		files.item_h = line_height.value = 18;
-	}	
+	}
+	BigFontsChange();
 }
diff --git a/programs/cmm/eolite/include/translations.h b/programs/cmm/eolite/include/translations.h
index 80cbc71928..f859e4eef0 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.92"
-#define ABOUT_TITLE "EOLITE 3.92"
+#define TITLE "Eolite File Manager v3.93"
+#define ABOUT_TITLE "EOLITE 3.93"
 
 #ifdef LANG_RUS
 	?define T_FILE "” ©«"