From 9a22c29788b5ee9a8f6fe1622a855c7f55454899 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 3 Nov 2016 11:20:08 -0700 Subject: [PATCH] Get ready for merge --- interface/resources/qml/hifi/toolbars/Toolbar.qml | 2 -- interface/src/Application.cpp | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/interface/resources/qml/hifi/toolbars/Toolbar.qml b/interface/resources/qml/hifi/toolbars/Toolbar.qml index f26f4b8a96..30989be688 100644 --- a/interface/resources/qml/hifi/toolbars/Toolbar.qml +++ b/interface/resources/qml/hifi/toolbars/Toolbar.qml @@ -25,13 +25,11 @@ Window { property real buttonSize: 50; property var buttons: [] property var container: horizontal ? row : column - property bool constrainToolbarToCenterX: false Settings { category: "toolbar/" + window.objectName property alias x: window.x property alias y: window.y - property alias constrainToolbarToCenterX: window.constrainToolbarToCenterX } onHorizontalChanged: { diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 85406a1e81..ae07ed1226 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -523,7 +523,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo _mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)), _previousScriptLocation("LastScriptLocation", DESKTOP_LOCATION), _fieldOfView("fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES), - _constrainToolbarPosition("constrainToolbarToCenterX", false), + _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true), _scaleMirror(1.0f), _rotateMirror(0.0f), _raiseMirror(0.0f),