Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-28 01:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
vladest 2017-09-28 22:55:01 +02:00
parent 769c57208c
commit 4023c40149
6 changed files with 7 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/LoginDialog/CompleteProfileBody.qml
View file

@ -65,7 +65,7 @@ Item {
text: qsTr("Cancel")
onClicked: root.destroy()
onClicked: root.tryDestroy()
}
}

2
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -56,7 +56,6 @@ Item {
parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
+ (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y);
console.log("sign in h:", targetHeight, parent.height, form.height)
}
}
@ -233,7 +232,6 @@ Item {
}
}
// Override ScrollingWindow's keyboard that would be at very bottom of dialog.
Keyboard {
raised: keyboardEnabled && keyboardRaised

1
interface/resources/qml/LoginDialog/SignUpBody.qml
View file

@ -50,7 +50,6 @@ Item {
parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
+ (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : 0);
console.log("sign up h:", parent.height, targetHeight, form.height)
}
}

2
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

@ -122,7 +122,7 @@ Item {
text: qsTr("Cancel")
onClicked: root.destroy()
onClicked: root.tryDestroy()
}
}

2
interface/resources/qml/LoginDialog/WelcomeBody.qml
View file

@ -77,7 +77,7 @@ Item {
text: qsTr("Close");
onClicked: root.destroy()
onClicked: root.tryDestroy()
}
}

48
interface/resources/qml/dialogs/TabletLoginDialog.qml
View file

@ -47,8 +47,10 @@ TabletModalWindow {
}
function tryDestroy() {
console.log("tryDestroy")
canceled()
}
Component.onDestruction: console.log("root dying")
}
//property int colorScheme: hifi.colorSchemes.dark
@ -81,7 +83,7 @@ TabletModalWindow {
onCanceled: {
if (bodyLoader.active === true) {
bodyLoader.active = false
//bodyLoader.active = false
}
if (gotoPreviousApp) {
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
@ -96,13 +98,12 @@ TabletModalWindow {
id: mfRoot
width: root.width
height: root.height //+ frameMarginTop
height: root.height + frameMarginTop + hifi.dimensions.contentMargin.x
anchors {
horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter
}
onHeightChanged: console.log("tablet mf h:", height)
LoginDialog {
id: loginDialog
@ -158,45 +159,4 @@ TabletModalWindow {
break
}
}
// LoginDialog {
// id: loginDialog
// width: parent.width
// height: parent.height
// StackView {
// id: bodyLoader
// property var item: currentItem
// property var props
// property string source: ""
// onCurrentItemChanged: {
// //cleanup source for future usage
// source = ""
// }
// function setSource(src, props) {
// source = "../TabletLoginDialog/" + src
// bodyLoader.props = props
// }
// function popup() {
// bodyLoader.pop()
// //check if last screen, if yes, dialog is popped out
// if (depth === 1)
// loginDialogRoot.canceled()
// }
// anchors.fill: parent
// anchors.margins: 10
// onSourceChanged: {
// if (source !== "") {
// bodyLoader.push(Qt.resolvedUrl(source), props)
// }
// }
// Component.onCompleted: {
// setSource(loginDialog.isSteamRunning() ?
// "SignInBody.qml" :
// "LinkAccountBody.qml")
// }
// }
// }
}