git.iko.soy/unity8
on xenial help sign in
New design for rating review, should hide the box until you rate when you require a rating
commit1217ebe6c86f66687790fe26550b64372f32d4cd authorAndrea Cimitan <andrea.cimitan@gmail.com> dateWed 24 Feb 2016, 17:07 (11 years ago) parentbf73bd6
2 files changed+19−5
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewRatingInput.qml+12−2 tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+7−3
qml/Dash/Previews/PreviewRatingInput.qml+12−2
@@ -40,7 +40,7 @@ PreviewWidget {
4040 switch(widgetData["visible"]) {
4141 default:
4242 case "both":
43− return ratingLabelAndWidgetContainer.implicitHeight + reviewContainer.implicitHeight;
43+ return ratingLabelAndWidgetContainer.implicitHeight + (reviewContainer.visible ? reviewContainer.implicitHeight : 0);
4444 case "rating":
4545 return ratingLabelAndWidgetContainer.implicitHeight;
4646 case "review":
@@ -114,7 +114,17 @@ PreviewWidget {
114114 bottom: parent.bottom
115115 topMargin: ratingLabelAndWidgetContainer.visible ? reviewContainer.innerMargin : 0
116116 }
117− visible: widgetData["visible"] !== "rating"
117+ visible: {
118+ switch(widgetData["visible"]) {
119+ default:
120+ case "both":
121+ return widgetData["required"] === "review" || rating.value > 0;
122+ case "rating":
123+ return false;
124+ case "review":
125+ return true;
126+ }
127+ }
118128
119129 Label {
120130 objectName: "reviewLabel"
tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml+7−3
@@ -120,8 +120,11 @@ Rectangle {
120120
121121 previewRatingInput.widgetData = data.widgetData;
122122
123+ if (data.widgetData["visible"] === "both" && data.widgetData["required"] === "both")
124+ compare(reviewTextArea.visible, false);
125+
123126 if (data.widgetData["visible"] !== "review") {
124− verify(rating.visible === true);
127+ compare(rating.visible, true);
125128
126129 rating.value = data.inputRating;
127130 if (data.widgetData["required"] !== "rating" ||
@@ -136,7 +139,8 @@ Rectangle {
136139 }
137140
138141 if (data.widgetData["visible"] !== "rating") {
139− verify(reviewTextArea.visible === true);
142+ if (data.widgetData["visible"] === "review" || data.widgetData["required"] === "review")
143+ compare(reviewTextArea.visible, true);
140144
141145 reviewTextArea.text = data.inputText;
142146 mouseClick(submitButton);
@@ -164,7 +168,7 @@ Rectangle {
164168 }
165169 }
166170 } else {
167− verify(reviewTextArea.visible === false);
171+ compare(reviewTextArea.visible, false);
168172 }
169173
170174 compare(spy.count === 1, data.emitted);