From 24e287083180fbde2a5224d1f278c0ec164ebca4 Mon Sep 17 00:00:00 2001
From: Daniel Pan <freeplant@gmail.com>
Date: Fri, 4 Mar 2016 16:40:45 +0800
Subject: [PATCH] Show 24px file icon for low DPI screen

---
 media/img/folder-192.png           | Bin 0 -> 1531 bytes
 static/scripts/app/views/dirent.js |   3 ++-
 static/scripts/common.js           |  23 ++++++++++++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 media/img/folder-192.png

diff --git a/media/img/folder-192.png b/media/img/folder-192.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7cca733a062eca51bd0f25390ffc0147ec26446
GIT binary patch
literal 1531
zcmXw12~<;85KRcH2n0b0P)v?mWl>2HM5`!~gryc5N#a&&qg6x&v4R1b1pdbq>OwU|
zE72l~0vbh;B@(hBheHd8Vk=0sk$_D^4F<BQsDOPhwD0`?{=AtxbMMUiN9oD&ZnOMn
zVK5lC!~|*z__o2<83*>=cE3boFm`_Q&zUrEv?vgh0<o%4ivqPM5wj98NPwpR*cKIH
zlJh|b!c-sxZ3IDJNCu*)Sj+<U_$_2y#<$85qXIF5QZNzi5v7@w1y&Vekr!B%C`?zt
zM71RIffyPPCWVGs4v7FpEB<!$HU}yJ5AXxLEd?G`s9p?2LKp-Cj}-3U8I$E26+8g2
zg<v88fJ6W`wIIe;NHivcJ7^6?ZPZYka;8U+h*$v;WP$a~@_bNsv=tx$2JEn=3G}Xj
zlL4XsdbEX}OLIWk(U$LK%35T+85yuCIbh@gzY6GqveB0cu2sf|NI(PtN;omdu0n?@
z5o1#x9G3#>0eG7Yh5+>NfiS>gYUKf^84e9PK^E*(g___1Q8Tn5sjWUb4)ojRW&+o0
zLmH%9P}!_PjsIgTO1@bEdxT|eZGv1gxLF1IX{wJGxb?=Ilw<}5S@9vWdgn)pcV&_P
zU{9_du{#~3$BFQtEQ>qQJm#>Wk}`Zg&*bE2c<Xb8e%<Qg_WJ%ccKW7P^Xxa1x3ZRe
z+3m4lb5r4qzXb2+L`=<-{&+j>X?*OU@<Pu3@d>YKf5xSbx~PNhy}P;;MpurX@KA6M
zcM)?jYTy5Nz|u$0sNaWQ)Hr({XI0c|PwkFYm419Lh`;JxnK)tKvSrJ;26E?~ui8fg
zkLJ$*Qxcj~Je2=)&6>SqnoEztKdwonQkZ$zm-ig72pNMRr@ntvZO0k%zo88U&B1lC
z@W5{&<h4;Q^2H?EB8RQpTIjN{iRFu*Sr1R9_a5KIW#61WRz+6cXWhA-sg|%hC7OlJ
zhMKs2QO)YGEy_V6`<`fPcHt3zuavi}_yd9+=}dQaaQ=ZJaO#N5i%I1PoEDPWadQ@|
zAqB5$$EC1S`f~0MV*SXX{w}lQu4fPPt)=~4uN-xEb&Oh)Cg7ASBcWpcO5CvxFI$>U
zgg>3DK|U)F(KFiv=njmeiY-|&Np%$i4;VFA4H8$rNFO1?ZDVf>?i(0$dtM)3RaF-5
zVsy;8o5QI6HSiDDzIf5-uv^ghokpyFb}O!!T^zhTMem+o<X7E8kYlx8oQOoxwY|A*
zN#rQTh))adKy%rIIw)JV`eI{ya$3;x0E2t^5m9ZA-DB)=4!wbT=IPwrHvPH48;msE
z7?M=Jv^(QHj+3EMQ_e(B;A%1pBX_@^!a9*ln5$ZK9xEk=E^k)y6AwbYA@H=ck67=N
z?aOk1;?bh!yrGY5FT{*D4o)$Ta@&YTQco;XN}NW5)Txv+y(LpvUdM`B=A$Ctw^!@R
zh?l#y#`%@?haFk-N{fBpUa70B>UMuT(X_NOxF%t$@t`(a!n+U>)^<`Y;R!>^jH??}
zU+BYW?}kgxX1oe#of|IMobf7z*0BFcNnR@FcW>JESiGzER(>EwP7!XhH!Wg`@f`$O
z?@yi`OK6()_$-EQ(w-uZ73O+U&Cawro*i88eBusXj4;%bYAETy`XU}r+^G9TU~-|Y
zrQyAv^-s*+!All~;XBXvw**n}U)QB*_X|vJk(*RB!q7%7S75@?3aEs2!C?&^q<4Gv
zO%{=NR{K73GKNML#1cGG>DpX@a6_r1{h_&$(=jC1jsAxxu1Bx*fj=ujmlb`C|G)*>
YV37_Yy5jSbx@>qzq$N{tu4fnh3m3yRm;e9(

literal 0
HcmV?d00001

diff --git a/static/scripts/app/views/dirent.js b/static/scripts/app/views/dirent.js
index 73128f8b3b..fecf79f608 100644
--- a/static/scripts/app/views/dirent.js
+++ b/static/scripts/app/views/dirent.js
@@ -35,12 +35,13 @@ define([
             var dirent_path = Common.pathJoin([dir.path, this.model.get('obj_name')]);
             var is_pro = app.pageOptions.is_pro;
             var file_audit_enabled = app.pageOptions.file_audit_enabled;
+            var file_icon_size = Common.isHiDPI() ? 48 : 24;
 
             this.$el.html(this.template({
                 dirent: this.model.attributes,
                 dirent_path: dirent_path,
                 encoded_path: Common.encodePath(dirent_path),
-                icon_url: this.model.getIconUrl(48),
+                icon_url: this.model.getIconUrl(file_icon_size),
                 url: this.model.getWebUrl(),
                 download_url: this.model.getDownloadUrl(),
                 category: dir.category,
diff --git a/static/scripts/common.js b/static/scripts/common.js
index b7268030ff..a72960e4f3 100644
--- a/static/scripts/common.js
+++ b/static/scripts/common.js
@@ -212,10 +212,27 @@ define([
         },
 
         getDirIconUrl: function(is_readonly, size) {
-            if (is_readonly) {
-                return app.config.mediaUrl + "img/folder-read-only-192.png";
+            if (size > 24) {
+                if (is_readonly) {
+                    return app.config.mediaUrl + "img/folder-read-only-192.png";
+                } else {
+                    return app.config.mediaUrl + "img/folder-192.png";
+                }
             } else {
-                return app.config.mediaUrl + "img/folder-beige-192.png";
+                if (is_readonly) {
+                    return app.config.mediaUrl + "img/folder-read-only-24.png";
+                } else {
+                    return app.config.mediaUrl + "img/folder-24.png";
+                }
+            }
+        },
+
+        isHiDPI: function() {
+            var pixelRatio = window.devicePixelRatio ? window.devicePixelRatio : 1;
+            if (pixelRatio > 1) {
+                return true;
+            } else {
+                return false;
             }
         },