The_Great_Archive/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-09-14 11:06:16 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Более графонистое выделение

Browse Source
This commit is contained in:
Igor Timofeev 2017-09-04 06:47:05 +03:00
parent 6860540145
commit e09ff425af
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Applications.cfg
View File

@ -223,7 +223,7 @@
path="/lib/MineOSCore.lua",
url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
type="Library",
version=1.73,
version=1.74,
},
{
path="/lib/advancedLua.lua",

28
lib/MineOSCore.lua
View File

@ -243,10 +243,20 @@ function MineOSCore.analyzeIconExtension(icon)
end
local function iconDraw(icon)
local text = string.limit(icon.showExtension and fs.name(icon.path) or fs.hideExtension(fs.name(icon.path)), icon.width, "center")
local textLength = unicode.len(text)
local textX, textY = math.floor(icon.x + icon.width / 2 - unicode.len(text) / 2), icon.y + icon.height - 1
if icon.selected then
buffer.square(icon.x, icon.y, icon.width, icon.height, icon.colors.selection, 0x000000, " ", 60)
local x, width = icon.x + 1, icon.width - 2
buffer.text(x, icon.y - 1, icon.colors.selection, string.rep("▄", width), icon.colors.selectionTransparency)
buffer.square(x, icon.y, width, icon.height - 2, icon.colors.selection, 0x000000, " ", icon.colors.selectionTransparency)
buffer.text(x, icon.y + icon.height - 2, icon.colors.selection, string.rep("▀", width), icon.colors.selectionTransparency)
buffer.square(textX, textY, textLength, 1, icon.colors.selection, 0x000000, " ", icon.colors.selectionTransparency)
end
buffer.text(textX, textY, icon.colors.text, text)
if icon.cut then
if not icon.semiTransparentImage then
icon.semiTransparentImage = image.copy(icon.image)
@ -263,15 +273,6 @@ local function iconDraw(icon)
buffer.image(icon.x + 2, icon.y, icon.image)
end
local text
if icon.showExtension then
text = string.limit(fs.name(icon.path), icon.width, "center")
else
text = string.limit(fs.hideExtension(fs.name(icon.path)), icon.width, "center")
end
buffer.text(math.floor(icon.x + icon.width / 2 - unicode.len(text) / 2), icon.y + icon.height - 1, icon.colors.text, text)
if icon.isShortcut then
buffer.set(icon.x + 9, icon.y + 3, 0xFFFFFF, 0x000000, "<")
end
@ -327,6 +328,7 @@ function MineOSCore.icon(x, y, path, textColor, selectionColor, showExtension)
icon.colors = {
text = textColor,
selection = selectionColor,
selectionTransparency = 60
}
icon.path = path
icon.isDirectory = fs.isDirectory(icon.path)
@ -562,10 +564,8 @@ local function iconFieldForegroundObjectDraw(object)
if y2 < y1 then
y1, y2 = y2, y1
end
local width, height = x2 - x1 + 1, y2 - y1 + 1
buffer.square(x1, y1, width, height, 0xFFFFFF, 0x0, " ", 70)
buffer.frame(x1, y1, width, height, 0xFFFFFF)
buffer.square(x1, y1, x2 - x1 + 1, y2 - y1 + 1, 0xFFFFFF, 0x0, " ", 60)
local partialWidth, partialHeight = MineOSCore.iconWidth * MineOSCore.selectionIconPart, MineOSCore.iconHeight * MineOSCore.selectionIconPart
for i = 1, #object.parent.iconsContainer.children do