TheHomecraft/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-01-09 12:42:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

afaefaef

Browse Source
This commit is contained in:
Igor 2016-03-19 21:57:00 +03:00
parent f6d23627f7
commit 52fcb4763a
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MineOS/OS.lua
View File

@ -152,13 +152,20 @@ local function drawDock()
--Рассчитываем размер и позицию дока на основе размера
local widthOfDock = (currentCountOfIconsInDock * (sizes.widthOfIcon + sizes.xSpaceBetweenIcons) - sizes.xSpaceBetweenIcons) + sizes.heightOfDock * 2 + 2
local xDock, yDock = math.floor(sizes.xSize / 2 - widthOfDock / 2) + 1, sizes.ySize - sizes.heightOfDock
local xDock, yDock = math.floor(sizes.xSize / 2 - widthOfDock / 2), sizes.ySize - sizes.heightOfDock
--Рисуем сам док
local transparency = colors.dockBaseTransparency
local currentDockWidth = widthOfDock - 2
for i = 1, sizes.heightOfDock do
buffer.square(xDock + i, sizes.ySize - i + 1, widthOfDock - i * 2, 1, 0xFFFFFF, 0xFFFFFF, " ", transparency)
buffer.text(xDock, yDock, 0xFFFFFF, "▟", transparency)
buffer.square(xDock, yDock, currentDockWidth, 1, 0xFFFFFF, 0xFFFFFF, " ", transparency)
buffer.text(xDock + currentDockWidth, yDock, 0xFFFFFF, "▙", transparency)
transparency = transparency + colors.dockTransparencyAdder
currentDockWidth = currentDockWidth - 4
xDock = xDock + 2
yDock = yDock - 1
end
--Рисуем ярлыки на доке

4
lib/doubleBuffering.lua
View File

@ -280,13 +280,13 @@ function buffer.line(x1, y1, x2, y2, background, foreground, symbol)
end
-- Отрисовка текста, подстраивающегося под текущий фон
function buffer.text(x, y, color, text)
function buffer.text(x, y, color, text, transparency)
local index
local sText = unicode.len(text)
for i = 1, sText do
if (x + i - 1) >= buffer.drawLimit.x1 and y >= buffer.drawLimit.y1 and (x + i - 1) <= buffer.drawLimit.x2 and y <= buffer.drawLimit.y2 then
index = convertCoordsToIndex(x + i - 1, y)
buffer.screen.new[index + 1] = color
buffer.screen.new[index + 1] = not transparency and color or colorlib.alphaBlend(buffer.screen.new[index + 1], color, transparency)
buffer.screen.new[index + 2] = unicode.sub(text, i, i)
end
end