From c8ba01f8ba57d164709d2c2441f42641302c1cdf Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Sat, 17 Sep 2016 19:41:09 +0300
Subject: [PATCH] =?UTF-8?q?=D1=85=D1=83=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store          | Bin 18436 -> 18436 bytes
 lib/ECSAPI.lua     |   7 +++++++
 lib/MineOSCore.lua |   2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.DS_Store b/.DS_Store
index 31efb9457ee8ed24c89da9f2cba5739a09f4badd..d6644772dade3bdfc96d325db092a7d3cddd628c 100644
GIT binary patch
delta 175
zcmZpfz}PZ@af1%Kgo%ZPj)IY?ajlL*wYj;0j)Iw)ac!-@fyw7(%{N!GFXCikl$|Uu
zc#5fD!sge4mP{b7nn(_aJ4K|LaWbdu`pIfmew%s4|8Z>QQb^<5Tqrk-aWj{J5;Fm_
ujaRXWn3$OAC>UFqfNZxgH`GxuF*cd(z;3;{#Oe<-(4^^%o7o-yvI79KoHQZ;

delta 118
zcmZpfz}PZ@af1#!hpB;~j)Jj?+2nn)?whOG7jZH%u}qd1JjGPZu=%y1B@>9NCXxf<
zP7$eQoNTK2Z!?ehKaS1Z3aNaX^W|nUZss;nWJWW`coo~^y<+~GORWAd0~JkY+|2Iq
GmmL5PNF?O|

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