Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 00:34:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Starting the new address bar layout

Browse source
This commit is contained in:
Niraj Venkat 2015-06-12 14:08:06 -07:00
parent 9a193acfa0
commit b9b8cfd60d
6 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/images/arrowcontainer.svg Normal file
View file

@ -0,0 +1,3 @@
<?xml version="1.0"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="287 459 133 64" width="133pt" height="64pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2015-06-12 18:23Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><rect fill="white" width="1728" height="1466"/><g><title> Navi Bar</title><path d="M 293.07144 459.1429 L 413.57144 459.1429 C 416.88515 459.1429 419.57144 461.8292 419.57144 465.1429 L 419.57144 516.71432 C 419.57144 520.02803 416.88515 522.71432 413.57144 522.71432 L 293.07144 522.71432 C 289.75773 522.71432 287.07144 520.02803 287.07144 516.71432 L 287.07144 465.1429 C 287.07144 461.8292 289.75773 459.1429 293.07144 459.1429 Z" fill="#ccc"/></g></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 1,008 B

3
interface/resources/images/darkgreyarrow.svg Normal file
View file

@ -0,0 +1,3 @@
<?xml version="1.0"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="315 474 23 34" width="23pt" height="34pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2015-06-12 18:23Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><rect fill="white" width="1728" height="1466"/><g><title> Navi Bar</title><path d="M 337.0727 474.23472 L 315.81902 490.9286 L 337.0727 507.62248 L 337.0727 474.23472 Z" fill="#535353"/></g></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 744 B

3
interface/resources/images/lightgreyarrow.svg Normal file
View file

@ -0,0 +1,3 @@
<?xml version="1.0"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="377 474 22 34" width="22pt" height="34pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2015-06-12 18:23Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><rect fill="white" width="1728" height="1466"/><g><title> Navi Bar</title><path d="M 377.10582 474.23472 L 398.3595 490.9286 L 377.10582 507.62248 L 377.10582 474.23472 Z" fill="#7e7e7e"/></g></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 746 B

3
interface/resources/images/sepline.svg Normal file
View file

@ -0,0 +1,3 @@
<?xml version="1.0"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xl="http://www.w3.org/1999/xlink" version="1.1" viewBox="344 454 26 74" width="26pt" height="74pt"><metadata xmlns:dc="http://purl.org/dc/elements/1.1/"><dc:date>2015-06-12 18:23Z</dc:date><!-- Produced by OmniGraffle Professional 5.4.4 --></metadata><defs></defs><g stroke="none" stroke-opacity="1" stroke-dasharray="none" fill="none" fill-opacity="1"><title>Canvas 1</title><rect fill="white" width="1728" height="1466"/><g><title> Navi Bar</title><line x1="356.58927" y1="466.42861" x2="356.58927" y2="515.4286" stroke="#b3b3b3" stroke-linecap="butt" stroke-linejoin="miter" stroke-width="3"/></g></g></svg>
Side by side

After

Width:  |  Height:  |  Size: 778 B

32
interface/resources/qml/AddressBarDialog.qml
View file

@ -45,19 +45,47 @@ DialogContainer {
property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area
property int inputAreaStep: (height - inputAreaHeight) / 2
Image {
id: arrowContainer
source: "../images/arrowcontainer.svg"
anchors {
fill: parent
leftMargin: parent.height + hifi.layout.spacing * 2
rightMargin: parent.height + hifi.layout.spacing * 50
topMargin: parent.inputAreaStep + hifi.layout.spacing
bottomMargin: parent.inputAreaStep + hifi.layout.spacing
}
}
//Image {
// id: darkGreyArrowBack
// source: "../images/darkgreyarrow.svg"
//anchors {
// fill: parent
// leftMargin: parent.height + hifi.layout.spacing * 4
// rightMargin: parent.height + hifi.layout.spacing * 55
// topMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing
// bottomMargin: parent.inputAreaStep + parent.inputAreaStep + hifi.layout.spacing
//}
//}
TextInput {
id: addressLine
anchors {
fill: parent
leftMargin: parent.height + hifi.layout.spacing * 2
leftMargin: parent.height + parent.height + hifi.layout.spacing * 5
rightMargin: hifi.layout.spacing * 2
topMargin: parent.inputAreaStep + hifi.layout.spacing
bottomMargin: parent.inputAreaStep + hifi.layout.spacing
}
font.pixelSize: hifi.fonts.pixelSize * root.scale
font.pixelSize: hifi.fonts.pixelSize * root.scale * 0.75
helperText: "Go to: place, @user, /path, network address"

5
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -48,6 +48,9 @@
#include "RenderablePolyVoxEntityItem.h"
#include "EntitiesRendererLogging.h"
#include "DependencyManager.h"
#include "AddressManager.h"
EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState,
AbstractScriptingServicesInterface* scriptingServices) :
OctreeRenderer(),
@ -921,7 +924,7 @@ void EntityTreeRenderer::mouseMoveEvent(QMouseEvent* event, unsigned int deviceI
QString urlString = rayPickResult.properties.getHref();
QUrl url = QUrl(urlString, QUrl::StrictMode);
if (url.isValid() && !url.isEmpty()){
if (url.isValid() && !url.isEmpty()) {
qCDebug(entitiesrenderer) << "mouseMoveEvent over entity:" << urlString;
} else {
qCDebug(entitiesrenderer) << "mouseMoveEvent over entity:" << "Not valid href";