fix(DAppSignRequestModal): correctly compute text painted height #15856
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,79 @@ | ||
| import QtQuick 2.15 | ||
|
There was a problem hiding this comment. Would be nice to have this component is storybook to have a playground regarding text of various length there. Also the name of the component could be improved probably. |
||
| import QtQuick.Layouts 1.15 | ||
| import QtGraphicalEffects 1.15 | ||
|
|
||
| import StatusQ.Controls 0.1 | ||
| import StatusQ.Core 0.1 | ||
| import StatusQ.Core.Theme 0.1 | ||
|
|
||
| import utils 1.0 | ||
|
|
||
| Rectangle { | ||
| id: root | ||
|
|
||
| property alias payloadToDisplay: contentText.text | ||
|
|
||
| border.width: 1 | ||
| border.color: Theme.palette.baseColor2 | ||
| color: "transparent" | ||
| radius: 8 | ||
|
|
||
| implicitHeight: d.expanded ? contentText.implicitHeight + (2 * contentText.anchors.margins) | ||
| : Math.min(contentText.implicitHeight + (2 * contentText.anchors.margins), d.maxContentHeight) | ||
|
|
||
| HoverHandler { | ||
| id: hoverHandler | ||
| target: root | ||
| } | ||
|
|
||
| StatusBaseText { | ||
| id: contentText | ||
| objectName: "textContent" | ||
|
|
||
| anchors.fill: parent | ||
| anchors.margins: 20 | ||
|
|
||
| text: root.payloadToDisplay | ||
| font.pixelSize: Style.current.additionalTextSize | ||
| lineHeightMode: Text.FixedHeight | ||
| lineHeight: 18 | ||
|
|
||
| wrapMode: Text.Wrap | ||
|
|
||
| layer.enabled: !d.expanded && d.canExpand | ||
| layer.effect: OpacityMask { | ||
| maskSource: Rectangle { | ||
| width: root.width | ||
| height: root.height | ||
| gradient: Gradient { | ||
| orientation: Gradient.Vertical | ||
| GradientStop { position: 0.0 } | ||
| GradientStop { position: (root.height - 60) / root.height } | ||
| GradientStop { position: 1; color: "transparent" } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| StatusFlatButton { | ||
| objectName: "expandButton" | ||
| anchors.top: parent.top | ||
| anchors.topMargin: 4 | ||
| anchors.right: parent.right | ||
| anchors.rightMargin: 4 | ||
| icon.name: d.expanded ? "collapse" : "expand" | ||
| icon.color: hovered ? Theme.palette.directColor1 : Theme.palette.baseColor1 | ||
| hoverColor: "transparent" | ||
| visible: d.canExpand && hoverHandler.hovered | ||
| onClicked: { | ||
| d.expanded = !d.expanded | ||
| } | ||
| } | ||
|
|
||
| QtObject { | ||
| id: d | ||
| readonly property int maxContentHeight: 350 | ||
| property bool expanded: false | ||
| readonly property bool canExpand: contentText.paintedHeight + (2 * contentText.anchors.margins) > maxContentHeight | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The diff seems like the whole file changed but it's because the file was originally committed with wrong DOS line endings