From 1047703718f444d1b929d331b82b0289d2ed153f Mon Sep 17 00:00:00 2001 From: David Rowe Date: Thu, 18 Jun 2015 11:18:56 -0700 Subject: [PATCH] Tidy address bar code Re-enable and reposition mouse drag areas Remove unused graphics assets Remove unused includes --- interface/resources/images/darkgreyarrow.png | Bin 369 -> 0 bytes interface/resources/images/lightgreyarrow.png | Bin 369 -> 0 bytes interface/resources/images/lightgreyarrow.svg | 11 --- .../{darkgreyarrow.svg => right-arrow.svg} | 0 interface/resources/images/sepline.png | Bin 127 -> 0 bytes interface/resources/images/sepline.svg | 3 - interface/resources/qml/AddressBarDialog.qml | 63 +++++++++--------- .../src/EntityTreeRenderer.cpp | 3 - 8 files changed, 31 insertions(+), 49 deletions(-) delete mode 100644 interface/resources/images/darkgreyarrow.png delete mode 100644 interface/resources/images/lightgreyarrow.png delete mode 100644 interface/resources/images/lightgreyarrow.svg rename interface/resources/images/{darkgreyarrow.svg => right-arrow.svg} (100%) delete mode 100644 interface/resources/images/sepline.png delete mode 100644 interface/resources/images/sepline.svg diff --git a/interface/resources/images/darkgreyarrow.png b/interface/resources/images/darkgreyarrow.png deleted file mode 100644 index 4c9a8a2bbf69185a4a64bce1da6460ba0996b57a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnEOP)#J37rGx zfCU5K0F*EXn*jn2z`>A!gh|+IazDrdr7hPcmkYG{a=qSbFG(VdizKWliWIIVL7;~F zz%mj7mJGa_ZzTYH!IkTO>IBS0)x-4v90dY1-mc!7rvP9LH^S1rHOjMGO#bqtwd7GQ zqYKap3SiDa?Yb*E0JeO>sZZXOO>RaVA=N=PxrNp++2j^Flud5IP|ly%>AG%ziE>G^ z{94IKldkKYaCg{O49egM?gpEqyisSWVOOSzx`L}jp$vX=Iu7qIf$Mn|gRb&yz(bT?YD?ay+nz0Xi}X@b^0xL?KLG{+pmtFIQSBgb P00000NkvXXu0mjfAz_+$ diff --git a/interface/resources/images/lightgreyarrow.png b/interface/resources/images/lightgreyarrow.png deleted file mode 100644 index 1e221f3c73af148b0cde671a1d14ffdf9d43d75f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnEOP)%^Hu`8V`qj`n;EIrpw7JNlQCp83a5T3eZtj_~t zrD7I4wj)DAr`U0xZ>a76s-r1fv6B%QU#+){ERVC^5>WL;y<XA9r8U7y*M$)1X#ML@Un$<^*$3PU?JUszyK(FG zOM=x~pRP9e$8qUVKYYf - - - - - - - - diff --git a/interface/resources/images/darkgreyarrow.svg b/interface/resources/images/right-arrow.svg similarity index 100% rename from interface/resources/images/darkgreyarrow.svg rename to interface/resources/images/right-arrow.svg diff --git a/interface/resources/images/sepline.png b/interface/resources/images/sepline.png deleted file mode 100644 index 959fcee72f740ca4de861595bf835dacad79b9fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0y~yU|?ooU@+uhV_;yApCv5Gz`!6`;u=vBoS#-wo>-L1 z;Fyx1l&avFo0y&&l$w}QS$HzlhJk@W(bL5-q~cc6ojsMG>)13B7?ao~+B+FJdy3pF fuRLd9kzml|VXm>1eSCv~fq}u()z4*}Q$iB}btNK7 diff --git a/interface/resources/images/sepline.svg b/interface/resources/images/sepline.svg deleted file mode 100644 index 32afaf7148..0000000000 --- a/interface/resources/images/sepline.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -2015-06-12 18:23ZCanvas 1 Navi Bar diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index 70cb22dc4d..7fa182fd93 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -45,6 +45,36 @@ DialogContainer { property int inputAreaHeight: 56.0 * root.scale // Height of the background's input area 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 { id: backArrow @@ -71,7 +101,7 @@ DialogContainer { Image { id: forwardArrow - source: "../images/darkgreyarrow.svg" + source: "../images/right-arrow.svg" anchors { fill: parent @@ -111,37 +141,6 @@ DialogContainer { 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 - } - }*/ } } diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index e1bd01547e..61a0c0dbb5 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -48,9 +48,6 @@ #include "RenderablePolyVoxEntityItem.h" #include "EntitiesRendererLogging.h" -#include "DependencyManager.h" -#include "AddressManager.h" - EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterface* viewState, AbstractScriptingServicesInterface* scriptingServices) : OctreeRenderer(),