From f0d59ab32fdaf4e4e8ef7414e0c8e818b7ccc8d9 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <igor@iMac-Igor.local>
Date: Sun, 10 Sep 2017 14:36:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=B0-=D0=B4=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Applications.cfg | 6 +++---
 MineOS/OS.lua    | 3 ++-
 lib/GUI.lua      | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Applications.cfg b/Applications.cfg
index 2b5aaf6e..d7359fba 100644
--- a/Applications.cfg
+++ b/Applications.cfg
@@ -5,7 +5,7 @@
 		about="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/MineOS/About/",
 		type="Script",
 		forceDownload=true,
-		version=3.77,
+		version=3.78,
 	},
 	{
 		path="/MineOS/Pictures/MoonTouch.pic",
@@ -223,7 +223,7 @@
 		path="/lib/MineOSCore.lua",
 		url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
 		type="Library",
-		version=1.77,
+		version=1.78,
 	},
 	{
 		path="/lib/advancedLua.lua",
@@ -283,7 +283,7 @@
 		url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/GUI.lua",
 		type="Library",
 		preloadFile=true,
-		version=1.78,
+		version=1.79,
 	},
 	{
 		path="/lib/rayEngine.lua",
diff --git a/MineOS/OS.lua b/MineOS/OS.lua
index 5c605aa9..ac92811e 100755
--- a/MineOS/OS.lua
+++ b/MineOS/OS.lua
@@ -310,7 +310,7 @@ local function changeResolution()
 	)
 	MineOSCore.OSMainContainer.iconField.localPosition.y = 3
 
-	MineOSCore.OSMainContainer.dockContainer.localPosition.x = math.floor(MineOSCore.OSMainContainer.width / 2 - MineOSCore.OSMainContainer.dockContainer.width / 2)
+	MineOSCore.OSMainContainer.dockContainer.sort()
 	MineOSCore.OSMainContainer.dockContainer.localPosition.y = MineOSCore.OSMainContainer.height - MineOSCore.OSMainContainer.dockContainer.height + 1
 
 	MineOSCore.OSMainContainer.menu.width = MineOSCore.OSMainContainer.width
@@ -375,6 +375,7 @@ local function createOSWindow()
 		end
 
 		MineOSCore.OSMainContainer.dockContainer.width = (#MineOSCore.OSMainContainer.dockContainer.children) * (MineOSCore.iconWidth + MineOSCore.OSMainContainer.iconField.spaceBetweenIcons.horizontal) - MineOSCore.OSMainContainer.iconField.spaceBetweenIcons.horizontal
+		MineOSCore.OSMainContainer.dockContainer.localPosition.x = math.floor(MineOSCore.OSMainContainer.width / 2 - MineOSCore.OSMainContainer.dockContainer.width / 2)
 	end
 
 	local function dockIconEventHandler(mainContainer, icon, eventData)
diff --git a/lib/GUI.lua b/lib/GUI.lua
index 66ef5094..19bc29de 100755
--- a/lib/GUI.lua
+++ b/lib/GUI.lua
@@ -1845,6 +1845,7 @@ local function contextMenuCalculate(menu)
 		end
 	end
 	menu.width = 2 + widestItem + (widestShortcut > 0 and 3 + widestShortcut or 0)
+	menu.height = #menu.itemsContainer.children
 end
 
 local function contextMenuShow(menu)