From c9c414d5a8aeffc29ae7efc3e86cdd02d0c03acb Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 5 Apr 2016 13:44:17 +1200 Subject: [PATCH 1/6] Fix entities editor display of large negative coordinates and angles --- examples/html/edit-style.css | 6 +++--- interface/resources/qml/ToolWindow.qml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/html/edit-style.css b/examples/html/edit-style.css index 02a3ba3cab..27a2cbe5e1 100644 --- a/examples/html/edit-style.css +++ b/examples/html/edit-style.css @@ -231,11 +231,11 @@ input[type="text"] { input[type="number"] { position: relative; height: 28px; - width: 120px; + width: 124px; } input[type=number] { - padding-right: 6px; + padding-right: 3px; } input[type=number]::-webkit-inner-spin-button { -webkit-appearance: none; @@ -657,7 +657,7 @@ div.refresh input[type="button"] { padding-left: 25px; } .pyr .tuple input { - padding-left: 45px; + padding-left: 40px; } .tuple div > label:first-child { diff --git a/interface/resources/qml/ToolWindow.qml b/interface/resources/qml/ToolWindow.qml index b6d70cb245..ddd314d9ff 100644 --- a/interface/resources/qml/ToolWindow.qml +++ b/interface/resources/qml/ToolWindow.qml @@ -30,7 +30,7 @@ Window { title: "Edit" property alias tabView: tabView implicitWidth: 520; implicitHeight: 695 - minSize: Qt.vector2d(400, 500) + minSize: Qt.vector2d(412, 500) HifiConstants { id: hifi } From 079e4080c1d43042447dc79fd87dbdb5b2f2c75f Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 7 Apr 2016 08:04:52 +1200 Subject: [PATCH 2/6] Fix entities editor fonts on OSX --- examples/html/edit-style.css | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/examples/html/edit-style.css b/examples/html/edit-style.css index 27a2cbe5e1..7975d825fa 100644 --- a/examples/html/edit-style.css +++ b/examples/html/edit-style.css @@ -10,43 +10,50 @@ @font-face { font-family: Raleway-Regular; - src: url(../../resources/fonts/Raleway-Regular.ttf), /* Production */ + src: url(../../resources/fonts/Raleway-Regular.ttf), /* Windows production */ + url(../../fonts/Raleway-Regular.ttf), /* OSX production */ url(../../interface/resources/fonts/Raleway-Regular.ttf); /* Development */ } @font-face { font-family: Raleway-Light; src: url(../../resources/fonts/Raleway-Light.ttf), + url(../../fonts/Raleway-Light.ttf), url(../../interface/resources/fonts/Raleway-Light.ttf); } @font-face { font-family: Raleway-Bold; src: url(../../resources/fonts/Raleway-Bold.ttf), + url(../../fonts/Raleway-Bold.ttf), url(../../interface/resources/fonts/Raleway-Bold.ttf); } @font-face { font-family: Raleway-SemiBold; src: url(../../resources/fonts/Raleway-SemiBold.ttf), + url(../../fonts/Raleway-SemiBold.ttf), url(../../interface/resources/fonts/Raleway-SemiBold.ttf); } @font-face { font-family: FiraSans-SemiBold; src: url(../../resources/fonts/FiraSans-SemiBold.ttf), + url(../../fonts/FiraSans-SemiBold.ttf), url(../../interface/resources/fonts/FiraSans-SemiBold.ttf); } @font-face { font-family: AnonymousPro-Regular; - src: url(../../resources/fonts/AnonymousPro-Regular.ttf), + src: url(../../resources/fonts/AnonymousPro-Regular.ttf), + url(../../fonts/AnonymousPro-Regular.ttf), url(../../interface/resources/fonts/AnonymousPro-Regular.ttf); } @font-face { font-family: HiFi-Glyphs; - src: url(../../resources/fonts/hifi-glyphs.ttf), + src: url(../../resources/fonts/hifi-glyphs.ttf), + url(../../fonts/hifi-glyphs.ttf), url(../../interface/resources/fonts/hifi-glyphs.ttf); } From dfa7416acb8df38fffe8fcc2109f3ad78decdc22 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 7 Apr 2016 08:10:24 +1200 Subject: [PATCH 3/6] Fix horizontal scrollbar appearing in entity properties tab on OSX --- examples/html/edit-style.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/html/edit-style.css b/examples/html/edit-style.css index 7975d825fa..1414e0a490 100644 --- a/examples/html/edit-style.css +++ b/examples/html/edit-style.css @@ -76,8 +76,10 @@ body { -moz-user-select: none; -ms-user-select: none; user-select: none; -} + overflow-x: hidden; + overflow-y: auto; +} table { font-family: FiraSans-SemiBold; From b6a511ac80fd9be5e25cc5987c08061809116188 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 7 Apr 2016 08:15:25 +1200 Subject: [PATCH 4/6] Fix spin box buttons not appearing on OSX --- examples/html/edit-style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/html/edit-style.css b/examples/html/edit-style.css index 1414e0a490..ed9898ed86 100644 --- a/examples/html/edit-style.css +++ b/examples/html/edit-style.css @@ -252,6 +252,7 @@ input[type=number]::-webkit-inner-spin-button { display: block; position: relative; width: 10px; + height: 100%; overflow: hidden; font-family: hifi-glyphs; font-size: 50px; From 9119b8271883e64900ba2b0daed810e9ec8d5e1a Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 7 Apr 2016 08:19:16 +1200 Subject: [PATCH 5/6] Fix right margin of entities list --- examples/html/edit-style.css | 3 +++ examples/html/entityList.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/html/edit-style.css b/examples/html/edit-style.css index ed9898ed86..ce304e71e4 100644 --- a/examples/html/edit-style.css +++ b/examples/html/edit-style.css @@ -789,6 +789,7 @@ textarea:enabled[scrolling="true"]::-webkit-resizer { width: 100%; overflow-x: hidden; overflow-y: auto; + box-sizing: border-box; padding-top: 28px; /* Space for header and footer outside of scroll region. */ margin-top: 28px; border-left: 2px solid #575757; @@ -807,6 +808,7 @@ textarea:enabled[scrolling="true"]::-webkit-resizer { } #entity-table thead { + box-sizing: border-box; border: 2px solid #575757; border-top-left-radius: 7px; border-top-right-radius: 7px; @@ -814,6 +816,7 @@ textarea:enabled[scrolling="true"]::-webkit-resizer { } #entity-table tfoot { + box-sizing: border-box; border: 2px solid #575757; border-bottom-left-radius: 7px; border-bottom-right-radius: 7px; diff --git a/examples/html/entityList.html b/examples/html/entityList.html index 532b18bb97..ec507afbc8 100644 --- a/examples/html/entityList.html +++ b/examples/html/entityList.html @@ -254,7 +254,7 @@ function resize() { // Take up available window space - elEntityTableScroll.style.height = window.innerHeight - 232; + elEntityTableScroll.style.height = window.innerHeight - 200; // Update the widths of the header cells to match the body var tds = document.querySelectorAll("#entity-table-body tr:first-child td"); From 86d314f31a3d90c0bf19cdd3938519bc2e3e4130 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 8 Apr 2016 10:47:45 +1200 Subject: [PATCH 6/6] Clarify code comment --- examples/html/edit-style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/html/edit-style.css b/examples/html/edit-style.css index ce304e71e4..e71c854dbb 100644 --- a/examples/html/edit-style.css +++ b/examples/html/edit-style.css @@ -12,7 +12,7 @@ font-family: Raleway-Regular; src: url(../../resources/fonts/Raleway-Regular.ttf), /* Windows production */ url(../../fonts/Raleway-Regular.ttf), /* OSX production */ - url(../../interface/resources/fonts/Raleway-Regular.ttf); /* Development */ + url(../../interface/resources/fonts/Raleway-Regular.ttf); /* Development, running script in /HiFi/examples */ } @font-face {