Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 09:23:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding tabbing between textfields

Browse source
This commit is contained in:
Wayne Chen 2018-10-31 16:57:03 -07:00
parent 6822287d67
commit c43e67e4a8
6 changed files with 72 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -29,14 +29,14 @@ Item {
id: d
readonly property int minWidth: 480
readonly property int minWidthButton: !root.isTablet ? 256 : 174
property int maxWidth: root.isTablet ? 1280 : Window.innerWidth
property int maxWidth: root.isTablet ? 1280 : root.width
readonly property int minHeight: 120
readonly property int minHeightButton: !root.isTablet ? 56 : 42
property int maxHeight: root.isTablet ? 720 : Window.innerHeight
property int maxHeight: root.isTablet ? 720 : root.height
function resize() {
maxWidth = root.isTablet ? 1280 : Window.innerWidth;
maxHeight = root.isTablet ? 720 : Window.innerHeight;
maxWidth = root.isTablet ? 1280 : root.width;
maxHeight = root.isTablet ? 720 : root.height;
if (root.isTablet === false) {
var targetWidth = Math.max(Math.max(titleWidth, Math.max(additionalTextContainer.contentWidth,
termsContainer.contentWidth)), mainContainer.width)

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

@ -40,11 +40,9 @@ Item {
id: d
readonly property int minWidth: 480
readonly property int minWidthButton: !root.isTablet ? 256 : 174
// property int maxWidth: root.isTablet ? 1280 : Window.innerWidth
property int maxWidth: root.isTablet ? 1280 : root.width
readonly property int minHeight: 120
readonly property int minHeightButton: !root.isTablet ? 56 : 42
// property int maxHeight: root.isTablet ? 720 : Window.innerHeight
property int maxHeight: root.isTablet ? 720 : root.height
function resize() {
@ -130,9 +128,7 @@ Item {
}
wrapMode: Text.WordWrap
lineHeight: 0.5
// TODO change back to white when background is chosen
// color: "white"
color: "black"
color: "white"
font.family: linkAccountBody.fontFamily
font.pixelSize: !root.isTablet ? 2 * linkAccountBody.fontSize : linkAccountBody.fontSize
font.bold: linkAccountBody.fontBold

8
interface/resources/qml/LoginDialog/LoggingInBody.qml
View file

@ -31,14 +31,14 @@ Item {
id: d
readonly property int minWidth: 480
readonly property int minWidthButton: !root.isTablet ? 256 : 174
property int maxWidth: root.isTablet ? 1280 : Window.innerWidth
property int maxWidth: root.isTablet ? 1280 : root.width
readonly property int minHeight: 120
readonly property int minHeightButton: !root.isTablet ? 56 : 42
property int maxHeight: root.isTablet ? 720 : Window.innerHeight
property int maxHeight: root.isTablet ? 720 : root.height
function resize() {
maxWidth = root.isTablet ? 1280 : Window.innerWidth;
maxHeight = root.isTablet ? 720 : Window.innerHeight;
maxWidth = root.isTablet ? 1280 : root.width;
maxHeight = root.isTablet ? 720 : root.height;
var targetWidth = Math.max(titleWidth, mainContainer.width);
var targetHeight = hifi.dimensions.contentSpacing.y + mainContainer.height +
4 * hifi.dimensions.contentSpacing.y;

73
interface/resources/qml/LoginDialog/SignInBody.qml
View file

@ -40,17 +40,13 @@ Item {
id: d
readonly property int minWidth: 480
readonly property int minWidthButton: !root.isTablet ? 256 : 174
// property int maxWidth: root.isTablet ? 1280 : Window.innerWidth
property int maxWidth: root.isTablet ? 1280 : root.width
readonly property int minHeight: 120
readonly property int minHeightButton: !root.isTablet ? 56 : 42
// property int maxHeight: root.isTablet ? 720 : Window.innerHeight
property int maxHeight: root.isTablet ? 720 : root.height
function resize() {
// maxWidth = root.isTablet ? 1280 : Window.innerWidth;
maxWidth = root.isTablet ? 1280 : root.width;
// maxHeight = root.isTablet ? 720 : Window.innerHeight;
maxHeight = root.isTablet ? 720 : root.height;
var targetWidth = Math.max(titleWidth, mainContainer.width);
var targetHeight = hifi.dimensions.contentSpacing.y + mainContainer.height +
@ -105,7 +101,6 @@ Item {
passwordField.text = "";
}
loginContainer.visible = true;
print(loginErrorMessage.visible);
}
Item {
@ -188,6 +183,25 @@ Item {
}
focus: !loginDialog.isLogIn
visible: false
Keys.onPressed: {
if (!usernameField.visible) {
return;
}
switch (event.key) {
case Qt.Key_Tab:
event.accepted = true;
if (event.modifiers === Qt.ShiftModifier) {
passwordField.focus = true;
} else {
emailField.focus = true;
}
break;
case Qt.Key_Backtab:
event.accepted = true;
passwordField.focus = true;
break;
}
}
}
HifiControlsUit.TextField {
@ -204,6 +218,24 @@ Item {
focus: loginDialog.isLogIn
placeholderText: "Username or Email"
activeFocusOnPress: true
Keys.onPressed: {
switch (event.key) {
case Qt.Key_Tab:
event.accepted = true;
if (event.modifiers === Qt.ShiftModifier) {
if (usernameField.visible) {
usernameField.focus = true;
break;
}
}
passwordField.focus = true;
break;
case Qt.Key_Backtab:
event.accepted = true;
usernameField.focus = true;
break;
}
}
}
HifiControlsUit.TextField {
id: passwordField
@ -258,8 +290,23 @@ Item {
}
}
}
Keys.onReturnPressed: {
signInBody.login()
Keys.onPressed: {
switch (event.key) {
case Qt.Key_Tab:
event.accepted = true;
if (event.modifiers === Qt.ShiftModifier) {
emailField.focus = true;
} else if (usernameField.visible) {
usernameField.focus = true;
} else {
emailField.focus = true;
}
break;
case Qt.Key_Backtab:
event.accepted = true;
emailField.focus = true;
break;
}
}
}
HifiControlsUit.CheckBox {
@ -381,13 +428,11 @@ Item {
}
switch (event.key) {
case Qt.Key_Escape:
break
case Qt.Key_Enter:
case Qt.Key_Return:
event.accepted = true
signInBody.login()
break
case Qt.Key_Enter:
case Qt.Key_Return:
event.accepted = true;
signInBody.login();
break;
}
}
}

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

@ -42,14 +42,14 @@ Item {
id: d
readonly property int minWidth: 480
readonly property int minWidthButton: !root.isTablet ? 256 : 174
property int maxWidth: root.isTablet ? 1280 : Window.innerWidth
property int maxWidth: root.isTablet ? 1280 : root.width
readonly property int minHeight: 120
readonly property int minHeightButton: !root.isTablet ? 56 : 42
property int maxHeight: root.isTablet ? 720 : Window.innerHeight
property int maxHeight: root.isTablet ? 720 : root.height
function resize() {
maxWidth = root.isTablet ? 1280 : Window.innerWidth;
maxHeight = root.isTablet ? 720 : Window.innerHeight;
maxWidth = root.isTablet ? 1280 : root.width;
maxHeight = root.isTablet ? 720 : root.height;
var targetWidth = Math.max(titleWidth, mainContainer.width);
var targetHeight = mainTextContainer.height +
hifi.dimensions.contentSpacing.y + textField.height +

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

@ -34,7 +34,6 @@ FocusScope {
property bool keyboardRaised: false
property bool punctuationMode: false
property bool isPassword: false
property alias text: loginKeyboard.mirroredText
readonly property bool isTablet: true