Slight ui cleanup

This commit is contained in:
Kung-vr
2019-03-19 15:06:47 +09:00
parent 2de7e47636
commit ccfb22c3b2
5 changed files with 48 additions and 41 deletions
-14
View File
@@ -318,20 +318,6 @@ MyStackViewPage {
} }
} }
GroupBox {
Layout.fillWidth: true
label: MyText {
leftPadding: 10
text: "Space Drag Binding"
bottomPadding: -10
}
background: Rectangle {
color: "transparent"
border.color: "#ffffff"
radius: 8
}
}
ColumnLayout { ColumnLayout {
RowLayout { RowLayout {
@@ -47,7 +47,7 @@ GroupBox {
MyText { MyText {
text: "Gravity Strength (+ is down):" text: "Gravity Strength (+ is down):"
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
Layout.rightMargin: 10 Layout.rightMargin: 2
} }
MyTextField { MyTextField {
@@ -118,14 +118,14 @@ GroupBox {
} }
MyText { MyText {
text: "Fling Strength" text: "Fling Strength:"
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
Layout.rightMargin: 10 Layout.rightMargin: 2
} }
MyTextField { MyTextField {
id: flingStrengthText id: flingStrengthText
text: "1.00" text: "1.0"
keyBoardUID: 153 keyBoardUID: 153
Layout.preferredWidth: 120 Layout.preferredWidth: 120
Layout.leftMargin: 10 Layout.leftMargin: 10
@@ -134,14 +134,46 @@ GroupBox {
function onInputEvent(input) { function onInputEvent(input) {
var val = parseFloat(input) var val = parseFloat(input)
if (!isNaN(val)) { if (!isNaN(val)) {
MoveCenterTabController.flingStrength = val.toFixed(2) MoveCenterTabController.flingStrength = val.toFixed(1)
text = MoveCenterTabController.flingStrength.toFixed(2) text = MoveCenterTabController.flingStrength.toFixed(1)
} else { } else {
text = MoveCenterTabController.flingStrength.toFixed(2) text = MoveCenterTabController.flingStrength.toFixed(1)
} }
} }
} }
MyPushButton2 {
Layout.preferredWidth: 50
text: "1x"
onClicked: {
MoveCenterTabController.flingStrength = 1.0
}
}
MyPushButton2 {
Layout.preferredWidth: 50
text: "2x"
onClicked: {
MoveCenterTabController.flingStrength = 2.0
}
}
MyPushButton2 {
Layout.preferredWidth: 50
text: "3x"
onClicked: {
MoveCenterTabController.flingStrength = 3.0
}
}
MyPushButton2 {
Layout.preferredWidth: 50
text: "4x"
onClicked: {
MoveCenterTabController.flingStrength = 4.0
}
}
} }
} }
@@ -47,7 +47,7 @@ GroupBox {
MyText { MyText {
text: "Height Offset (+ is down):" text: "Height Offset (+ is down):"
horizontalAlignment: Text.AlignRight horizontalAlignment: Text.AlignRight
Layout.rightMargin: 10 Layout.rightMargin: 2
} }
MyTextField { MyTextField {
@@ -64,7 +64,7 @@ GroupBox {
MoveCenterTabController.heightToggleOffset = val.toFixed(2) MoveCenterTabController.heightToggleOffset = val.toFixed(2)
text = MoveCenterTabController.heightToggleOffset.toFixed(2) text = MoveCenterTabController.heightToggleOffset.toFixed(2)
} else { } else {
text = MoveCenterTabController.heighToggleOffset.toFixed(2) text = MoveCenterTabController.heightToggleOffset.toFixed(2)
} }
} }
} }
@@ -8,30 +8,18 @@ GroupBox {
id: snapTurnGroupBox id: snapTurnGroupBox
Layout.fillWidth: true Layout.fillWidth: true
label: MyText {
leftPadding: 10
text: "Snap Turn Angle"
bottomPadding: -10
}
background: Rectangle {
color: "transparent"
border.color: "#ffffff"
radius: 8
}
ColumnLayout { ColumnLayout {
anchors.fill: parent anchors.fill: parent
Rectangle {
color: "#ffffff"
height: 1
Layout.fillWidth: true
Layout.bottomMargin: 5
}
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
MyText {
text: "Snap Turn Angle:"
horizontalAlignment: Text.AlignRight
Layout.rightMargin: 2
}
MyTextField { MyTextField {
id: snapTurnAngleText id: snapTurnAngleText
text: "45°" text: "45°"
@@ -494,6 +494,7 @@ void MoveCenterTabController::setGravityStrength( float value, bool notify )
{ {
emit gravityStrengthChanged( m_gravityStrength ); emit gravityStrengthChanged( m_gravityStrength );
} }
m_lastGravityUpdateTimePoint = std::chrono::steady_clock::now();
} }
float MoveCenterTabController::flingStrength() const float MoveCenterTabController::flingStrength() const