From b04d6854553e7fa4ddbaf3da2baa69682decb332 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <methodman1@mail.ru>
Date: Mon, 12 Feb 2018 11:44:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D1=8B=20=D1=81=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=B4=D0=B5=D1=80=D0=B0=20=D0=B8=20=D1=85=D1=83?=
 =?UTF-8?q?=D0=B9=D0=BD=D0=B8=D0=BD=D1=8B=20=D1=8D=D1=82=D0=BE=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Applications.cfg                             |  11 ++-
 Applications/RunningString/Icon.pic          | Bin 183 -> 143 bytes
 Applications/RunningString/RunningString.lua |  88 ++++++++-----------
 lib/GUI.lua                                  |   8 +-
 lib/scale.lua                                |   4 +-
 5 files changed, 50 insertions(+), 61 deletions(-)
 mode change 100644 => 100755 Applications/RunningString/Icon.pic

diff --git a/Applications.cfg b/Applications.cfg
index 9e647178..59e69f79 100644
--- a/Applications.cfg
+++ b/Applications.cfg
@@ -235,6 +235,12 @@
 		type="Library",
 		version=1.08,
 	},
+	{
+		path="/lib/scale.lua",
+		url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/scale.lua",
+		type="Library",
+		version=1.08,
+	},
 	{
 		path="/lib/MineOSInterface.lua",
 		url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSInterface.lua",
@@ -292,7 +298,6 @@
 		path="/lib/FormatModules/OCAF.lua",
 		url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/FormatModules/OCAF.lua",
 		type="Library",
-		preloadFile=true,
 		version=1.01,
 	},
 	{
@@ -319,7 +324,7 @@
 		url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/GUI.lua",
 		type="Library",
 		preloadFile=true,
-		version=2.15,
+		version=2.16,
 	},
 	{
 		path="/lib/rayEngine.lua",
@@ -842,7 +847,7 @@
 		type="Application",
 		icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/RunningString/Icon.pic",
 		createShortcut=true,
-		version=1.01,
+		version=1.02,
 	},
 	{
 		path="/MineOS/Applications/Graph2",
diff --git a/Applications/RunningString/Icon.pic b/Applications/RunningString/Icon.pic
old mode 100644
new mode 100755
index 6eacebcc4e2eb9a017a4e7109d1e561ef89a0a26..deba57a66038f2e20613b2dc4300b6a1d3930966
GIT binary patch
literal 143
zcmX}ky9t0m5CqVhoxQsSo3Ix_FcNG+Obq<w2G(F{7GMch;3<dMTV`h4s;Pr1oGS)6
z+#>Kq=(8hX>uU&P`9SEL!7fL*jy>^&8ieXYv@+c;eKV%zln4Ggwy%f3H@=Ywsey<O
DkJ}RI

literal 183
zcmYMsy$!-Z3<cnOw(rheR>&?$NK~xEUy}-@$s9<ChJqRFCIe&yCg2iTqWkpxo{zi3
zzNjFj&QD1Af|30kV!wpMubT*BV+hN1Yn&kpV#%edy`x{3X?-^X|Jy5e<o8hR8xj$e
W31puwW)yp@YI$L(J)_M&gz^t^KqP7a

diff --git a/Applications/RunningString/RunningString.lua b/Applications/RunningString/RunningString.lua
index d2773f52..ee5afab2 100644
--- a/Applications/RunningString/RunningString.lua
+++ b/Applications/RunningString/RunningString.lua
@@ -1,63 +1,47 @@
-local ecs = require("ECSAPI")
-local event = require("event")
-local gpu = require("component").gpu
+local MineOSInterface = require("MineOSInterface")
+local GUI = require("GUI")
+local buffer = require("doubleBuffering")
+local scale = require("scale")
 local unicode = require("unicode")
-local keyboard = require("keyboard")
+local event = require("event")
 
-local str,freq,speed,scale,bg,fg
+---------------------------------------------------------------------------------------------------------
 
--- gpu.setResolution(gpu.maxResolution())
--- ecs.prepareToExit()
+local container = MineOSInterface.addUniversalContainer(MineOSInterface.mainContainer, "Running string setup")
 
-local data = ecs.universalWindow("auto", "auto", 30, ecs.windowColors.background, true,
-	{"EmptyLine"},
-	{"CenterText", 0x880000, "Бегущая строка"},
-	{"EmptyLine"},
-	{"CenterText", 0x000000, "Для выхода из программы"},
-	{"CenterText", 0x000000, "удерживайте Enter"},
-	{"EmptyLine"},
-	{"Input", 0x262626, 0x880000, "Программист за работой, не мешай, сука!"},
-	{"Color", "Цвет фона", 0x000000},
-	{"Color", "Цвет текста", 0xFFFFFF},
-	{"Slider", 0x262626, 0x880000, 1, 100, 1, "Масштаб: ", "%"},
-    {"Slider", 0x262626, 0x880000, 1, 100, 40, "Скорость: ", "/100 FPS"},
-	{"EmptyLine"},
-	{"Button", {0xbbbbbb, 0xffffff, "OK"}, {0x999999, 0xffffff, "Отмена"}}
-)
+local textInput = container.layout:addChild(GUI.input(1, 1, 36, 3, 0xFFFFFF, 0x696969, 0xB4B4B4, 0xFFFFFF, 0x2D2D2D, "Working on cool things, don't distract me", "Type text here", true))
+local backgroundColorSelector = container.layout:addChild(GUI.colorSelector(1, 1, 36, 3, 0x0, "Background color"))
+local textColorSelector = container.layout:addChild(GUI.colorSelector(1, 1, 36, 3, 0xFFFFFF, "Text color"))
+local scaleSlider = container.layout:addChild(GUI.slider(1, 1, 36, 0x66DB80, 0x2D2D2D, 0xE1E1E1, 0x878787, 1, 1000, 100, false, "Scale: ", ""))
+local delaySlider = container.layout:addChild(GUI.slider(1, 1, 36, 0x66DB80, 0x2D2D2D, 0xE1E1E1, 0x878787, 0, 500, 50, false, "Delay: ", " ms"))
+local spacingSlider = container.layout:addChild(GUI.slider(1, 1, 36, 0x66DB80, 0x2D2D2D, 0xE1E1E1, 0x878787, 1, 50, 10, false, "Spacing: ", " char(s)"))
+scaleSlider.roundValues, delaySlider.roundValues, spacingSlider.roundValues = true, true, true
+spacingSlider.height = 2
 
--- ecs.error(table.unpack(data))
-if data[6] == "OK" then
-	str = data[1] or "Где текст, сука?"
-	bg = tonumber(data[2]) or 0x000000
-	fg = tonumber(data[3]) or 0xFFFFFF
-	scale = tonumber(data[4])/100 or 0.1
-	speed = tonumber(data[5])/100 or 0.4
-	freq = 5
-else
-	return
-end
-
-local xOld, yOld = gpu.getResolution()
-ecs.setScale(scale)
-local xSize, ySize = gpu.getResolution()
-gpu.setBackground(bg)
-gpu.setForeground(fg)
-gpu.fill(1, 1, xSize, ySize, " ")
-
-str = " " .. str .. string.rep(" ", freq)
-
-while true do
-	str = unicode.sub(str, 2, -1) .. unicode.sub(str, 1, 1)
-	gpu.set(math.ceil(xSize / 2 - unicode.len(str) / 2), math.ceil(ySize / 2), str)
+container.layout:addChild(GUI.button(1, 1, 36, 3, 0x2D2D2D, 0xFFFFFF, 0x0, 0xFFFFFF, "OK")).onTouch = function()
+	local text = textInput.text .. string.rep(" ", math.round(spacingSlider.value))
+	local gpu = buffer.getGPUProxy()
 	
-	if keyboard.isKeyDown(28) then
-		gpu.setResolution(xOld, yOld)
-		ecs.prepareToExit()
-		return
+	scale.set(scaleSlider.value / 1000)
+	local width, height = gpu.getResolution()
+	local y = math.round(height / 2)
+	
+	gpu.setBackground(backgroundColorSelector.color)
+	gpu.setForeground(textColorSelector.color)
+	gpu.fill(1, 1, width, height, " ")
+
+	while true do
+		local eventData = {event.pull(delaySlider.value / 1000)}
+		if eventData[1] == "touch" or eventData[1] == "key_down" then
+			break
+		end
+
+		text = unicode.sub(text, 2, -1) .. unicode.sub(text, 1, 1)
+		gpu.set(1, y, text)
 	end
 
-	local e = event.pull(speed)
-	if e == "key_down" or e == "touch" then return end
+	buffer.setResolution(buffer.getResolution())
+	MineOSInterface.OSDraw()
 end
 
 
diff --git a/lib/GUI.lua b/lib/GUI.lua
index 3c8267bb..fb8dd31d 100755
--- a/lib/GUI.lua
+++ b/lib/GUI.lua
@@ -1661,18 +1661,18 @@ local function sliderDraw(object)
 		buffer.text(math.floor(object.x + object.width / 2 - unicode.len(stringCurrentValue) / 2), object.y + 1, object.colors.value, stringCurrentValue)
 	end
 
-	local activeWidth = math.floor(object.width - ((object.maximumValue - object.value) * object.width / (object.maximumValue - object.minimumValue)))
+	local activeWidth = math.round((object.value - object.minimumValue) / (object.maximumValue - object.minimumValue) * object.width)
 	buffer.text(object.x, object.y, object.colors.passive, string.rep("━", object.width))
 	buffer.text(object.x, object.y, object.colors.active, string.rep("━", activeWidth))
-	buffer.text(object.x + activeWidth - 1, object.y, object.colors.pipe, "⬤")
+	buffer.text(object.x + activeWidth, object.y, object.colors.pipe, "⬤")
 
 	return object
 end
 
 local function sliderEventHandler(mainContainer, object, eventData)
 	if eventData[1] == "touch" or eventData[1] == "drag" then
-		local clickPosition = eventData[3] - object.x + 1
-		object.value = object.minimumValue + (clickPosition * (object.maximumValue - object.minimumValue) / object.width)
+		local clickPosition = eventData[3] - object.x
+		object.value = object.minimumValue + (clickPosition / object.width * (object.maximumValue - object.minimumValue))
 		mainContainer:draw()
 		buffer.draw()
 		callMethod(object.onValueChanged, object.value, eventData)
diff --git a/lib/scale.lua b/lib/scale.lua
index f5d1a639..b9275b54 100755
--- a/lib/scale.lua
+++ b/lib/scale.lua
@@ -17,8 +17,8 @@ end
 function screenScale.getResolution(scale, debug)
 	if scale > 1 then
 		scale = 1
-	elseif scale < 0.1 then
-		scale = 0.1
+	elseif scale <= 0.01 then
+		scale = 0.01
 	end
 
 	local xScreens, yScreens = component.proxy(component.gpu.getScreen()).getAspectRatio()