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

aefae

Browse Source
This commit is contained in:
Igor Timofeev 2017-01-08 18:42:37 +03:00
parent 4665c6c56e
commit e090805ed9
4 changed files with 17 additions and 22 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.

6
Applications.txt
View File

@ -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={
{

21
lib/palette.lua
View File

@ -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)

12
lib/windows.lua
View File

@ -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, ...)