diff --git a/.DS_Store b/.DS_Store index 31efb945..d6644772 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/lib/ECSAPI.lua b/lib/ECSAPI.lua index 182628ed..9a8fb2fe 100755 --- a/lib/ECSAPI.lua +++ b/lib/ECSAPI.lua @@ -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 diff --git a/lib/MineOSCore.lua b/lib/MineOSCore.lua index 579e08f5..3eecff5e 100755 --- a/lib/MineOSCore.lua +++ b/lib/MineOSCore.lua @@ -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