From 6de335e1b123bfe1580544fee20324a0aa725d1f Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 26 Aug 2016 17:24:25 +1200 Subject: [PATCH] Column heading text and glyphs --- scripts/system/html/css/edit-style.css | 4 ++-- scripts/system/html/entityList.html | 16 ++++++++-------- scripts/system/html/js/entityList.js | 6 ++++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css index 8ed044acbc..6405e9ef6c 100644 --- a/scripts/system/html/css/edit-style.css +++ b/scripts/system/html/css/edit-style.css @@ -863,7 +863,7 @@ textarea:enabled[scrolling="true"]::-webkit-resizer { #entity-list .glyph { font-family: HiFi-Glyphs; - font-size: 14px; + font-size: 15px; } #search-area { @@ -1124,4 +1124,4 @@ input#reset-to-natural-dimensions { margin-top:5px; font-size:16px; display:none; -} \ No newline at end of file +} diff --git a/scripts/system/html/entityList.html b/scripts/system/html/entityList.html index 16598c1ae1..db4e7b04d4 100644 --- a/scripts/system/html/entityList.html +++ b/scripts/system/html/entityList.html @@ -56,12 +56,12 @@ File - V - T - S - T - D - S + Verts + Texts + T Size + ' + Draws + Q @@ -74,9 +74,9 @@ - + - + ID diff --git a/scripts/system/html/js/entityList.js b/scripts/system/html/js/entityList.js index 8dbef1247f..ba21825058 100644 --- a/scripts/system/html/js/entityList.js +++ b/scripts/system/html/js/entityList.js @@ -16,6 +16,8 @@ const ASCENDING_STRING = '▾'; const DESCENDING_STRING = '▴'; const LOCKED_GLYPH = ""; const VISIBLE_GLYPH = ""; +const TRANSPARENCY_GLYPH = "'"; +const SCRIPT_GLYPH = "Q"; const DELETE = 46; // Key code for the delete key. const MAX_ITEMS = Number.MAX_VALUE; // Used to set the max length of the list of discovered entities. @@ -272,9 +274,9 @@ function loaded() { newEntities[i].locked ? LOCKED_GLYPH : null, newEntities[i].visible ? VISIBLE_GLYPH : null, newEntities[i].verticesCount, newEntities[i].texturesCount, newEntities[i].texturesSize, - newEntities[i].hasTransparent ? "T" : null, + newEntities[i].hasTransparent ? TRANSPARENCY_GLYPH : null, newEntities[i].drawCalls, - newEntities[i].hasScript ? "T" : null); + newEntities[i].hasScript ? SCRIPT_GLYPH : null); } updateSelectedEntities(data.selectedIDs); resize();