diff --git a/.DS_Store b/.DS_Store index 1c8a5a6a..e9b1a646 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Applications.txt b/Applications.txt index 04a9f7df..1efb5ff8 100644 --- a/Applications.txt +++ b/Applications.txt @@ -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", diff --git a/Applications/AppMarket/AppMarket.lua b/Applications/AppMarket/AppMarket.lua index cbfa5826..11cd2790 100755 --- a/Applications/AppMarket/AppMarket.lua +++ b/Applications/AppMarket/AppMarket.lua @@ -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 diff --git a/lib/GUI.lua b/lib/GUI.lua index f4420969..7ba141ce 100755 --- a/lib/GUI.lua +++ b/lib/GUI.lua @@ -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