Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 02:56:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #12443 from zfox23/commerce_SendMoneyUiFix1

Browse source 
Commerce: Wallet/Send Money UI fixes
This commit is contained in:
John Conklin II 2018-02-21 09:02:13 -08:00 committed by GitHub
commit 9e1ea191b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
View file

@ -75,8 +75,6 @@ Item {
// TODO: Fix this unlikely bug // TODO: Fix this unlikely bug
onVisibleChanged: { onVisibleChanged: {
if (visible) { if (visible) {
passphraseField.error = false;
passphraseField.focus = true;
sendSignalToParent({method: 'disableHmdPreview'}); sendSignalToParent({method: 'disableHmdPreview'});
} else { } else {
sendSignalToParent({method: 'maybeEnableHmdPreview'}); sendSignalToParent({method: 'maybeEnableHmdPreview'});
@ -206,6 +204,14 @@ Item {
placeholderText: "passphrase"; placeholderText: "passphrase";
activeFocusOnPress: true; activeFocusOnPress: true;
activeFocusOnTab: true; activeFocusOnTab: true;
onVisibleChanged: {
if (visible) {
error = false;
focus = true;
forceActiveFocus();
}
}
onFocusChanged: { onFocusChanged: {
root.keyboardRaised = focus; root.keyboardRaised = focus;

10
interface/resources/qml/hifi/commerce/wallet/sendMoney/SendMoney.qml
View file

@ -923,7 +923,7 @@ Item {
anchors.leftMargin: 20; anchors.leftMargin: 20;
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: 20; anchors.rightMargin: 20;
height: 140; height: 95;
FontLoader { id: firaSansSemiBold; source: "../../../../../fonts/FiraSans-SemiBold.ttf"; } FontLoader { id: firaSansSemiBold; source: "../../../../../fonts/FiraSans-SemiBold.ttf"; }
TextArea { TextArea {
@ -947,8 +947,14 @@ Item {
wrapMode: TextEdit.Wrap; wrapMode: TextEdit.Wrap;
activeFocusOnPress: true; activeFocusOnPress: true;
activeFocusOnTab: true; activeFocusOnTab: true;
// Workaround for no max length on TextAreas
onTextChanged: { onTextChanged: {
// Don't allow tabs or newlines
if ((/[\n\r\t]/g).test(text)) {
var cursor = cursorPosition;
text = text.replace(/[\n\r\t]/g, '');
cursorPosition = cursor-1;
}
// Workaround for no max length on TextAreas
if (text.length > maximumLength) { if (text.length > maximumLength) {
var cursor = cursorPosition; var cursor = cursorPosition;
text = previousText; text = previousText;