Tidy address bar code
Re-enable and reposition mouse drag areas Remove unused graphics assets Remove unused includes
Before Width: | Height: | Size: 369 B |
Before Width: | Height: | Size: 369 B |
|
@ -1,11 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
|
||||||
<svg version="1.1" id="Layer_1" xmlns:xl="http://www.w3.org/1999/xlink"
|
|
||||||
xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="133.1 714.2 21.3 33.4"
|
|
||||||
enable-background="new 133.1 714.2 21.3 33.4" xml:space="preserve">
|
|
||||||
<g>
|
|
||||||
<g>
|
|
||||||
<path fill="#7E7E7E" d="M133.1,714.2l21.3,16.7l-21.3,16.7V714.2z"/>
|
|
||||||
</g>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
Before Width: | Height: | Size: 501 B |
Before Width: | Height: | Size: 501 B After Width: | Height: | Size: 501 B |
Before Width: | Height: | Size: 127 B |
|
@ -1,3 +0,0 @@
|
||||||
<?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>
|
|
Before Width: | Height: | Size: 778 B |
|
@ -45,6 +45,36 @@ DialogContainer {
|
||||||
property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area
|
property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area
|
||||||
property int inputAreaStep: (height - inputAreaHeight) / 2
|
property int inputAreaStep: (height - inputAreaHeight) / 2
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
// Drag the icon
|
||||||
|
width: parent.height
|
||||||
|
height: parent.height
|
||||||
|
x: 0
|
||||||
|
y: 0
|
||||||
|
drag {
|
||||||
|
target: root
|
||||||
|
minimumX: -parent.inputAreaStep
|
||||||
|
minimumY: -parent.inputAreaStep
|
||||||
|
maximumX: root.parent ? root.maximumX : 0
|
||||||
|
maximumY: root.parent ? root.maximumY + parent.inputAreaStep : 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
// Drag the input rectangle
|
||||||
|
width: parent.width - parent.height
|
||||||
|
height: parent.inputAreaHeight
|
||||||
|
x: parent.height
|
||||||
|
y: parent.inputAreaStep
|
||||||
|
drag {
|
||||||
|
target: root
|
||||||
|
minimumX: -parent.inputAreaStep
|
||||||
|
minimumY: -parent.inputAreaStep
|
||||||
|
maximumX: root.parent ? root.maximumX : 0
|
||||||
|
maximumY: root.parent ? root.maximumY + parent.inputAreaStep : 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Image {
|
Image {
|
||||||
id: backArrow
|
id: backArrow
|
||||||
|
|
||||||
|
@ -71,7 +101,7 @@ DialogContainer {
|
||||||
Image {
|
Image {
|
||||||
id: forwardArrow
|
id: forwardArrow
|
||||||
|
|
||||||
source: "../images/darkgreyarrow.svg"
|
source: "../images/right-arrow.svg"
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
fill: parent
|
fill: parent
|
||||||
|
@ -111,37 +141,6 @@ DialogContainer {
|
||||||
addressBarDialog.loadAddress(addressLine.text)
|
addressBarDialog.loadAddress(addressLine.text)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
|
||||||
// Drag the icon
|
|
||||||
width: parent.height
|
|
||||||
height: parent.height
|
|
||||||
x: 0
|
|
||||||
y: 0
|
|
||||||
drag {
|
|
||||||
target: root
|
|
||||||
minimumX: -parent.inputAreaStep
|
|
||||||
minimumY: -parent.inputAreaStep
|
|
||||||
maximumX: root.parent ? root.maximumX : 0
|
|
||||||
maximumY: root.parent ? root.maximumY + parent.inputAreaStep : 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
MouseArea {
|
|
||||||
// Drag the input rectangle
|
|
||||||
width: parent.width - parent.height
|
|
||||||
height: parent.inputAreaHeight
|
|
||||||
x: parent.height
|
|
||||||
y: parent.inputAreaStep
|
|
||||||
drag {
|
|
||||||
target: root
|
|
||||||
minimumX: -parent.inputAreaStep
|
|
||||||
minimumY: -parent.inputAreaStep
|
|
||||||
maximumX: root.parent ? root.maximumX : 0
|
|
||||||
maximumY: root.parent ? root.maximumY + parent.inputAreaStep : 0
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,9 +48,6 @@
|
||||||
#include "RenderablePolyVoxEntityItem.h"
|
#include "RenderablePolyVoxEntityItem.h"
|
||||||
#include "EntitiesRendererLogging.h"
|
#include "EntitiesRendererLogging.h"
|
||||||
|
|
||||||
#include "DependencyManager.h"
|
|
||||||
#include "AddressManager.h"
|
|
||||||
|
|
||||||
EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState,
|
EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState,
|
||||||
AbstractScriptingServicesInterface* scriptingServices) :
|
AbstractScriptingServicesInterface* scriptingServices) :
|
||||||
OctreeRenderer(),
|
OctreeRenderer(),
|
||||||
|
|