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 2016-09-17 19:41:09 +03:00
parent 9ae7e9a58b
commit c8ba01f8ba
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

7
lib/ECSAPI.lua
View File

@ -2036,8 +2036,15 @@ function ecs.universalWindow(x, y, width, background, closeWindowAfter, ...)
os.sleep(0.3)
objects[key][3] = oldColor
displayObject(key)
local paletteWidth, paletteHeight = 75, 27
local screenWidth, screenHeight = component.gpu.getResolution()
local paletteX, paletteY = math.floor(screenWidth / 2 - paletteWidth / 2), math.floor(screenHeight / 2 - paletteHeight / 2)
local oldPixels = ecs.rememberOldPixels(paletteX, paletteY, paletteX + paletteWidth - 1, paletteY + paletteHeight - 1)
local color = loadfile("lib/palette.lua")().draw("auto", "auto", objects[key][3])
ecs.drawOldPixels(oldPixels)
objects[key][3] = color or oldColor
displayObject(key)
break
end

2
lib/MineOSCore.lua
View File

@ -376,7 +376,7 @@ function MineOSCore.launchIcon(path, translate)
--Если это 3D-модель
elseif fileFormat == ".3dm" then
MineOSCore.safeLaunch("MineOS/Applications/3DPrint.app/3DPrint.lua open " .. path)
MineOSCore.safeLaunch("MineOS/Applications/3DPrint.app/3DPrint.lua", "open", path)
--Если это текст или конфиг или языковой
elseif fileFormat == ".txt" or fileFormat == ".cfg" or fileFormat == ".lang" then