SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge mainline changes into qt6

Browse Source
This commit is contained in:
ykeara
2026-09-25 15:06:43 -05:00
parent 9ecdda1572 31df8b476b
commit 8d661d2b31
30 changed files with 2965 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/res/qml/FixFloorPage.qml
+17 -17
View File
@@ -165,15 +165,15 @@ MyStackViewPage {
Connections {
target: MoveCenterTabController
function onTrackingUniverseChanged() {
if (MoveCenterTabController.trackingUniverse === 0) {
fixButton.enabled = false
recenterButton.enabled = false
zeroSpaceButton.enabled = false
revertButton.enabled = false
undoFixButton.enabled = false
seatedWarningText.visible = true
} else if (MoveCenterTabController.trackingUniverse === 1) {
onTrackingUniverseChanged: {
// if (MoveCenterTabController.trackingUniverse === 0) {
// fixButton.enabled = false
// recenterButton.enabled = false
// zeroSpaceButton.enabled = false
// revertButton.enabled = false
// undoFixButton.enabled = false
// seatedWarningText.visible = true
// } else if (MoveCenterTabController.trackingUniverse === 1) {
fixButton.enabled = true
recenterButton.enabled = true
zeroSpaceButton.enabled = true
@@ -181,14 +181,14 @@ MyStackViewPage {
// undoFixButton.enabled = true
// TODO Fix Undo Feature -^
seatedWarningText.visible = false
} else {
fixButton.enabled = false
recenterButton.enabled = false
zeroSpaceButton.enabled = false
revertButton.enabled = false
undoFixButton.enabled = false
seatedWarningText.visible = false
}
// } else {
// fixButton.enabled = false
// recenterButton.enabled = false
// zeroSpaceButton.enabled = false
// revertButton.enabled = false
// undoFixButton.enabled = false
// seatedWarningText.visible = false
// }
}
}
src/res/qml/common/MyTextField.qml
+52 -5
View File
@@ -5,6 +5,7 @@ import ovras.advsettings 1.0
TextField {
property int keyBoardUID: 0
property string savedText: ""
property bool active: false
id: myTextField
color: "#d9dbe0"
text: ""
@@ -18,19 +19,25 @@ TextField {
}
onClicked: {
myTextField.forceActiveFocus()
active = true;
}
}
onActiveFocusChanged: {
if (activeFocus) {
active = true;
if (!OverlayController.desktopMode) {
OverlayController.showKeyboard(text, keyBoardUID)
} else {
savedText = text
}
//savedText = text
}
//When box loses focus apply changes
else{
myTextField.onInputEvent(text)
active = false;
}
}
onEditingFinished: {
if (OverlayController.desktopMode && savedText !== text) {
if(OverlayController.desktopMode){
myTextField.onInputEvent(text)
}
}
@@ -39,11 +46,51 @@ TextField {
}
Connections {
target: OverlayController
<<<<<<< HEAD
function onKeyBoardInputSignal() {
=======
onSubmitLastTextField:{
//value here is UID
if(value == 0){
active = false;
return;
}
if(value == keyBoardUID && active == true){
myTextField.onInputEvent(text)
active = false;
}
}
onKeyBoardInputSignal: {
>>>>>>> origin/master
if (userValue == keyBoardUID) {
if (myTextField.text !== input) {
myTextField.onInputEvent(input)
if(input == '\b'){
myTextField.text = text.slice(0,-1)
return
}
else if(input == '\e'){
myTextField.text = text.slice(0,cursorPosition)+text.slice(cursorposition+1)
return;
}
//Execute input
else if(input == '\n'){
if(!OverlayController.desktopMode){
//myTextField.onInputEvent(input)
myTextField.focus = false;
}
return;
}
else if(input=='\r'){
return;
}
else{
myTextField.text = text + input;
}
//if (myTextField.text !== input) {
// myTextField.onInputEvent(input)
//}
}
}
}