From e090805ed975d8b7d64bbab7e2671c14afab6f1f Mon Sep 17 00:00:00 2001 From: Igor Timofeev Date: Sun, 8 Jan 2017 18:42:37 +0300 Subject: [PATCH] aefae --- .DS_Store | Bin 18436 -> 18436 bytes Applications.txt | 6 ++++-- lib/palette.lua | 21 +++++++++------------ lib/windows.lua | 12 ++++-------- 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/.DS_Store b/.DS_Store index b8ecab30ee9f5e23e079a32f020c420d2931bccd..468382be46e867c143e6fb426414f78759b4c2e9 100644 GIT binary patch delta 22 dcmZpfz}PZ@af7-QyQPJWg0Z3DW<9HGyZ}zV29p2) delta 22 dcmZpfz}PZ@af7-QyNRWaf{C%oW<9HGyZ}zM29*E+ diff --git a/Applications.txt b/Applications.txt index 24608651..1eb8f392 100644 --- a/Applications.txt +++ b/Applications.txt @@ -300,7 +300,7 @@ name="lib/windows.lua", url="IgorTimofeev/OpenComputers/master/lib/windows.lua", type="Library", - version=1.05, + version=1.06, }, { name="lib/rayEngine.lua", @@ -360,7 +360,7 @@ name="lib/palette.lua", url="IgorTimofeev/OpenComputers/master/lib/palette.lua", type="Library", - version=1.03, + version=1.04, }, { name="lib/doubleBuffering.lua", @@ -588,6 +588,7 @@ type="Application", icon="IgorTimofeev/OpenComputers/master/Applications/VK/Icon.pic", createShortcut="dock", + forceDownload=true, version=1.24, resources={ { @@ -666,6 +667,7 @@ type="Application", icon="IgorTimofeev/OpenComputers/master/Applications/RayWalk/Icon.pic", createShortcut="desktop", + forceDownload=true, version=1.57, resources={ { diff --git a/lib/palette.lua b/lib/palette.lua index 6eb45a15..efffdc8f 100755 --- a/lib/palette.lua +++ b/lib/palette.lua @@ -1,18 +1,14 @@ -- _G.windows, _G.GUI, package.loaded.windows, package.loaded.GUI = nil, nil, nil, nil -local libraries = { - advancedLua = "advancedLua", - component = "component", - fs = "filesystem", - colorlib = "colorlib", - image = "image", - buffer = "doubleBuffering", - GUI = "GUI", - windows = "windows", -} - -for library in pairs(libraries) do if not _G[library] then _G[library] = require(libraries[library]) end end; libraries = nil +local advancedLua = require("advancedLua") +local component = require("component") +local fs = require("filesystem") +local colorlib = require("colorlib") +local image = require("image") +local buffer = require("doubleBuffering") +local GUI = require("GUI") +local windows = require("windows") -------------------------------------------------------------------------------------------------------------- @@ -269,6 +265,7 @@ end -------------------------------------------------------------------------------------------------------------- function palette.show(x, y, startColor) + buffer.start() loadFavourites() switchColorFromHex(startColor or 0x00B6FF) createWindow(x, y) diff --git a/lib/windows.lua b/lib/windows.lua index f4c4bbc8..42b37578 100755 --- a/lib/windows.lua +++ b/lib/windows.lua @@ -211,7 +211,7 @@ local function newWindow(x, y, width, height, minimumWidth, minimumHeight) local window = GUI.container(x, y, width, height) window.minimumWidth = minimumWidth window.minimumHeight = minimumHeight - window.drawShadow = true + window.drawShadow = false window.drawMethodOutOfWindowsLibrary = window.draw window.draw = drawWindow window.handleEventData = windows.handleEventData @@ -224,16 +224,12 @@ end ----------------------------------------- Window patterns ----------------------------------------- -function windows.empty(x, y, width, height, minimumWidth, minimumHeight, title) - local window = newWindow(x, y, width, height, minimumWidth, minimumHeight) - window.drawShadow = false - return window +function windows.empty(x, y, width, height, minimumWidth, minimumHeight) + return newWindow(x, y, width, height, minimumWidth, minimumHeight) end function windows.fullScreen() - local window = newWindow(1, 1, buffer.screen.width, buffer.screen.height) - window.drawShadow = false - return window + return newWindow(1, 1, buffer.screen.width, buffer.screen.height) end function windows.tabbed(x, y, width, height, minimumWidth, minimumHeight, ...)