Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-08 17:03:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dev feedback/fixing keyboard in profile creation

Browse source
This commit is contained in:
Wayne Chen 2018-12-12 17:33:22 -08:00
parent 0a0b7bf1ad
commit a2ebb67cd5
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -131,22 +131,6 @@ Item {
break;
}
}
Component.onCompleted: {
root.text = "";
root.isPassword = false;
}
}
// Override ScrollingWindow's keyboard that would be at very bottom of dialog.
HifiControlsUit.Keyboard {
raised: keyboardEnabled && keyboardRaised
numeric: punctuationMode
anchors {
left: parent.left
right: parent.right
bottom: buttons.top
bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0
}
}
Item {
@ -201,6 +185,14 @@ Item {
}
}
Component.onCompleted: {
//but rise Tablet's one instead for Tablet interface
root.keyboardEnabled = HMD.active;
root.keyboardRaised = Qt.binding( function() { return keyboardRaised; })
root.text = "";
d.resize();
}
Connections {
target: loginDialog
onHandleCreateCompleted: {

6
interface/src/LoginStateManager.h
View file

@ -20,8 +20,8 @@
class LoginStateManager : protected ReadWriteLockable {
public:
LoginStateManager() {}
~LoginStateManager() {}
LoginStateManager() = default;
~LoginStateManager() = default;
void setUp();
void tearDown();
@ -38,4 +38,4 @@ private:
unsigned int _rightLoginPointerID { PointerEvent::INVALID_POINTER_ID };
};
#endif // hifi_LoginStateManager_h
#endif // hifi_LoginStateManager_h