TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-01-07 19:52:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Да-да

Browse Source
This commit is contained in:
Igor Timofeev 2017-09-10 14:36:30 +03:00
parent d91435ae12
commit f0d59ab32f
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Applications.cfg
View File

@ -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",

3
MineOS/OS.lua
View File

@ -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)

1
lib/GUI.lua
View File

@ -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)