From 911c44fd47c24cecc8a412e092c852479dff08f3 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Mon, 16 Jan 2017 07:06:40 +0300
Subject: [PATCH] aefaef

---
 .DS_Store                            | Bin 18436 -> 18436 bytes
 Applications.txt                     |   4 ++--
 Applications/AppMarket/AppMarket.lua |   2 +-
 lib/GUI.lua                          |   9 ++-------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 1c8a5a6aae86a1d0e325d151f32bf32cd2b62c25..e9b1a64672c71ca177247587eb3215bbfa737175 100644
GIT binary patch
delta 563
zcmXYt%WD%+7{%wOR_?`t-qZ(X91zl&SP7*nlxiC(5o$H9-NaUm7RSz1rsh#QvG~He
zh))m-BZ{CX7R8;9T3;)5<sXoh3vumUp>A|0)4RBE&bjyd_?`MZ^?6?PDK`08wdh;h
zcFZ+op<<PtMyrao>2YI=R7>KxZPlFNs_jm?j@?X*xUp4;V(9Omae_Ot^@Nd>$`S?7
zy|^+Wt#?S}$-)`8vhp>fcM4_8BPHvUQ;MeT)OQP&mt(U|&y43*E0No+_lOu7d32&$
zE<2T)7umf=R;X`cJX}6xd9{&gr{dUtF16iXjwL6)Yd^JL+HdWTwygct{vnX8Lnlsx
zc9L|lhrRTXB}bki4l_c56O3~bi_=VV7LOX2xyE&FaT}k9JmN7=c*zGo^2xv2Hriqi
z9vo~9YFqHHte^7V8L7F=L0x)6Ps$h#skBC@&9vDef(q5DrqnZLXIPM09i>fhTdI~Q
z4T!_C)S4*m)dSMJRBI#IZ{|X9C8Eb^b3h7(XxF0S-`TLQ*hM$}3~+!$0o^d8jB$)&
zz&9DNxlB>w9J8F~0+*-<j5oO1WW38g?(=}BEbxryyx=u&c*_#+`OFu-E~YmA*!3Td
CCx?ar

delta 464
zcmXYt-Aj{U0L9<mmG9tzJ=>JFS3x#tE)=yWLnuE&YGFduQcEM&o@e&DuX1W-5nZgP
zF2Z_<3c9F>5=2dg)n(Mb;BDOm-F4Yb(8s&A+j9=*{5X|mD$Be*APJd+vg!{t3vtF(
zx;XD<T|H+mCBnN>#dJXj*!KCh{W1^?M;tM&((`((q-r50x9tCp+1weLsYRkON2JQ`
zl9uU)74Hxtm2-<qmK!ylUBWq)PoLL$seE?5xp%j4CKmNv*)0|2XhYoBC!EPlsZj8k
z$^p6>vgwSs$-#)@oUWk^E2Wifo9}`BnJ?Bi>xcEz`epsL{#bvpX<-LpBE;yXhhF*_
zV2EK3G0JgHaFP^f$)L$H!$q#J#5JySi~Bs_A%<tHvc@_aeBcwG&CTF=Q+x7g(l18L
zpnPF&gl0`H5%+uFv_@k>NUQ#rd7e0Dk94#PiS09$<|9+x?DfVElk}#KF~&HPOfl`v
zXSu*EIr1!UnX7e#3b(n#UG8}Zk9f=zp7N4cyygunY*J;5cf99g4XPS%`MT#Him`TL

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