This commit is contained in:
Igor Timofeev 2017-01-16 07:06:40 +03:00
parent aa8d5a9b99
commit 911c44fd47
4 changed files with 5 additions and 10 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@ -300,7 +300,7 @@
name="lib/GUI.lua",
url="IgorTimofeev/OpenComputers/master/lib/GUI.lua",
type="Library",
version=1.36,
version=1.37,
},
{
name="lib/windows.lua",
@ -1015,7 +1015,7 @@
icon="IgorTimofeev/OpenComputers/master/Applications/AppMarket/Icon.pic",
createShortcut="dock",
forceDownload=true,
version=1.51,
version=1.52,
resources={
{
name="Localization/Russian.lang",

View File

@ -320,7 +320,7 @@ local function updateAll()
local xText = math.floor(sizes.x + sizes.width / 2 - unicode.len(text) / 2)
buffer.square(sizes.x, y + 1, sizes.width, 1, 0xFFFFFF)
buffer.text(xText, y + 1, colors.description, text)
GUI.progressBar(xBar, y, barWidth, 1, 0xCCCCCC, 0x0092FF, 0x0, math.ceil(i / #changes * 100), true, false):draw()
GUI.progressBar(xBar, y, barWidth, 0x0092FF, 0xCCCCCC, 0x0, math.ceil(i / #changes * 100), true, false):draw()
buffer.draw()
ecs.getOSApplication(newApplications[changes[i]], true)
end

View File

@ -1702,13 +1702,8 @@ local function treeViewDraw(treeView)
end
if treeView.fileList[fileIndex].isDirectory then
if treeView.directoriesToShowContent[treeView.fileList[fileIndex].path] then
buffer.text(treeView.x + treeView.fileList[fileIndex].xOffset, y, treeView.colors.arrow, "")
buffer.text(treeView.x + treeView.fileList[fileIndex].xOffset + 2, y, textColor, unicode.sub("" .. fs.name(treeView.fileList[fileIndex].path), 1, textLimit - treeView.fileList[fileIndex].xOffset - 2))
else
buffer.text(treeView.x + treeView.fileList[fileIndex].xOffset, y, treeView.colors.arrow, "")
buffer.text(treeView.x + treeView.fileList[fileIndex].xOffset + 2, y, textColor, unicode.sub("" .. fs.name(treeView.fileList[fileIndex].path), 1, textLimit - treeView.fileList[fileIndex].xOffset - 2))
end
buffer.text(treeView.x + treeView.fileList[fileIndex].xOffset, y, treeView.colors.arrow, treeView.directoriesToShowContent[treeView.fileList[fileIndex].path] and "" or "")
buffer.text(treeView.x + treeView.fileList[fileIndex].xOffset + 2, y, textColor, unicode.sub("" .. fs.name(treeView.fileList[fileIndex].path), 1, textLimit - treeView.fileList[fileIndex].xOffset - 2))
else
buffer.text(treeView.x + treeView.fileList[fileIndex].xOffset, y, textColor, unicode.sub("" .. fs.name(treeView.fileList[fileIndex].path), 1, textLimit - treeView.fileList[fileIndex].xOffset))
end