Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 09:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Get ready for merge

Browse source
This commit is contained in:
Zach Fox 2016-11-03 11:20:08 -07:00
parent e9e1d0cb2f
commit 9a22c29788
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/toolbars/Toolbar.qml
View file

@ -25,13 +25,11 @@ Window {
property real buttonSize: 50; property real buttonSize: 50;
property var buttons: [] property var buttons: []
property var container: horizontal ? row : column property var container: horizontal ? row : column
property bool constrainToolbarToCenterX: false
Settings { Settings {
category: "toolbar/" + window.objectName category: "toolbar/" + window.objectName
property alias x: window.x property alias x: window.x
property alias y: window.y property alias y: window.y
property alias constrainToolbarToCenterX: window.constrainToolbarToCenterX
} }
onHorizontalChanged: { onHorizontalChanged: {

2
interface/src/Application.cpp
View file

@ -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)), _mirrorViewRect(QRect(MIRROR_VIEW_LEFT_PADDING, MIRROR_VIEW_TOP_PADDING, MIRROR_VIEW_WIDTH, MIRROR_VIEW_HEIGHT)),
_previousScriptLocation("LastScriptLocation", DESKTOP_LOCATION), _previousScriptLocation("LastScriptLocation", DESKTOP_LOCATION),
_fieldOfView("fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES), _fieldOfView("fieldOfView", DEFAULT_FIELD_OF_VIEW_DEGREES),
_constrainToolbarPosition("constrainToolbarToCenterX", false), _constrainToolbarPosition("toolbar/constrainToolbarToCenterX", true),
_scaleMirror(1.0f), _scaleMirror(1.0f),
_rotateMirror(0.0f), _rotateMirror(0.0f),
_raiseMirror(0.0f), _raiseMirror(0.0f),