Polish display confirmation state
This commit is contained in:
@@ -47,12 +47,12 @@ Item {
|
|||||||
|
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.right: parent.right
|
anchors.right: parent.right
|
||||||
anchors.top: pinnedHeader.active ? pinnedHeader.bottom : parent.top
|
anchors.top: pinnedHeader.implicitHeight > 0 ? pinnedHeader.bottom : parent.top
|
||||||
anchors.bottom: parent.bottom
|
anchors.bottom: parent.bottom
|
||||||
anchors.topMargin: pinnedHeader.active ? 16 : 0
|
anchors.topMargin: pinnedHeader.implicitHeight > 0 ? 16 : 0
|
||||||
clip: true
|
clip: true
|
||||||
contentWidth: width
|
contentWidth: width
|
||||||
contentHeight: layout.implicitHeight + (pinnedHeader.active ? 34 : 64)
|
contentHeight: layout.implicitHeight + (pinnedHeader.implicitHeight > 0 ? 34 : 64)
|
||||||
boundsBehavior: Flickable.StopAtBounds
|
boundsBehavior: Flickable.StopAtBounds
|
||||||
|
|
||||||
Column {
|
Column {
|
||||||
@@ -60,7 +60,7 @@ Item {
|
|||||||
|
|
||||||
width: parent.width - 68
|
width: parent.width - 68
|
||||||
x: 34
|
x: 34
|
||||||
y: pinnedHeader.active ? 0 : 30
|
y: pinnedHeader.implicitHeight > 0 ? 0 : 30
|
||||||
spacing: 16
|
spacing: 16
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
|
|||||||
@@ -122,7 +122,9 @@ Singleton {
|
|||||||
root.pendingVerified = true;
|
root.pendingVerified = true;
|
||||||
verifyTimer.stop();
|
verifyTimer.stop();
|
||||||
root.lastError = "";
|
root.lastError = "";
|
||||||
} else if (!root.awaitingConfirmation) {
|
} else if (!root.awaitingConfirmation && (
|
||||||
|
root.lastError === "Could not read the connected displays."
|
||||||
|
|| root.lastError === "The display list could not be read.")) {
|
||||||
root.lastError = "";
|
root.lastError = "";
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|||||||
Reference in New Issue
Block a user