From b74c1d3476fcac27cf08647f0bd29a9cc3f3fcc1 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 3 Nov 2016 10:42:15 -0700 Subject: [PATCH] tabs to spaces --- interface/resources/qml/hifi/toolbars/Toolbar.qml | 4 ++-- interface/src/Application.cpp | 2 +- interface/src/ui/PreferencesDialog.cpp | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/interface/resources/qml/hifi/toolbars/Toolbar.qml b/interface/resources/qml/hifi/toolbars/Toolbar.qml index 2968d61324..f26f4b8a96 100644 --- a/interface/resources/qml/hifi/toolbars/Toolbar.qml +++ b/interface/resources/qml/hifi/toolbars/Toolbar.qml @@ -25,13 +25,13 @@ Window { property real buttonSize: 50; property var buttons: [] property var container: horizontal ? row : column - property bool constrainToolbarToCenterX: false + property bool constrainToolbarToCenterX: false Settings { category: "toolbar/" + window.objectName property alias x: window.x property alias y: window.y - property alias constrainToolbarToCenterX: window.constrainToolbarToCenterX + property alias constrainToolbarToCenterX: window.constrainToolbarToCenterX } onHorizontalChanged: { diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index ecedc33542..85406a1e81 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2152,7 +2152,7 @@ void Application::setFieldOfView(float fov) { } void Application::setSettingConstrainToolbarPosition(bool setting) { - _constrainToolbarPosition.set(setting); + _constrainToolbarPosition.set(setting); } void Application::aboutApp() { diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index 37135a9379..70be1f61d5 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -66,14 +66,14 @@ void setupPreferences() { auto getter = [=]()->bool { return myAvatar->getClearOverlayWhenMoving(); }; auto setter = [=](bool value) { myAvatar->setClearOverlayWhenMoving(value); }; preferences->addPreference(new CheckPreference(AVATAR_BASICS, "Clear overlays when moving", getter, setter)); - } + } - // UI - { - auto getter = []()->bool { return qApp->getSettingConstrainToolbarPosition(); }; - auto setter = [](bool value) { qApp->setSettingConstrainToolbarPosition(!value); }; - preferences->addPreference(new CheckPreference("UI", "Constrain Toolbar Position to Horizontal Center", getter, setter)); - } + // UI + { + auto getter = []()->bool { return qApp->getSettingConstrainToolbarPosition(); }; + auto setter = [](bool value) { qApp->setSettingConstrainToolbarPosition(!value); }; + preferences->addPreference(new CheckPreference("UI", "Constrain Toolbar Position to Horizontal Center", getter, setter)); + } // Snapshots static const QString SNAPSHOTS { "Snapshots" };