From e40fc20cb67bf4fd3259b030b5c0b794d81655fc Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Mon, 4 Jun 2018 13:00:08 -0700 Subject: [PATCH] fix some bugs that had been introduced by various out-of-team prs. --- interface/resources/qml/controls-uit/TextField.qml | 6 +++--- interface/resources/qml/hifi/Pal.qml | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/controls-uit/TextField.qml b/interface/resources/qml/controls-uit/TextField.qml index 6743d08275..917068ac01 100644 --- a/interface/resources/qml/controls-uit/TextField.qml +++ b/interface/resources/qml/controls-uit/TextField.qml @@ -165,11 +165,11 @@ TextField { anchors.left: parent.left Binding on anchors.right { - when: parent.right - value: parent.right + when: textField.right + value: textField.right } Binding on wrapMode { - when: parent.right + when: textField.right value: Text.WordWrap } diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 8a067c0733..9a818ef4db 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -479,7 +479,6 @@ Rectangle { visible: !isCheckBox && !isButton && !isAvgAudio; uuid: model ? model.sessionId : ""; selected: styleData.selected; - isReplicated: model.isReplicated; isAdmin: model && model.admin; isPresent: model && model.isPresent; // Size