Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions src/EasyApplication/Gui/Elements/Parameter.qml
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,48 @@ EaElements.TextField {
property string units: ''
property string title: ''

rightPadding: unitsPlaceholder.width
readonly property bool hasUnits: units.length > 0
readonly property real unitsSpacing: EaStyle.Sizes.fontPixelSize * 0.5

leftPadding: padding
rightPadding: padding + (hasUnits ? unitsSpacing + unitsPlaceholder.implicitWidth : 0)

topInset: title === '' ? 0 : EaStyle.Sizes.fontPixelSize * 1.5
topPadding: topInset + padding

implicitWidth: Math.max(
EaStyle.Sizes.fontPixelSize * 10,
Math.max(contentWidth, implicitPlaceholderWidth) + leftPadding + rightPadding,
titleLabel.implicitWidth + leftPadding + padding
)
placeholderText: ''

EaElements.Label {
id: titleLabel

anchors.left: control.left
anchors.leftMargin: control.leftPadding

enabled: false
text: control.title
}

PlaceholderText {
id: unitsPlaceholder

x: control.width - width
visible: control.hasUnits

anchors.right: control.right
anchors.rightMargin: control.padding
anchors.baseline: control.baseline
leftPadding: EaStyle.Sizes.fontPixelSize * 0.5
rightPadding: EaStyle.Sizes.fontPixelSize * 0.75

leftPadding: 0
rightPadding: 0

font: control.font
color: control.placeholderTextColor

text: units
text: control.units
textFormat: Text.RichText
}
}
3 changes: 2 additions & 1 deletion src/EasyApplication/Gui/Elements/TextField.qml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ T.TextField {

property bool warned: false
property bool enterFlash: false
readonly property real implicitPlaceholderWidth: placeholder.implicitWidth

implicitWidth: implicitBackgroundWidth + leftInset + rightInset
|| Math.max(contentWidth, placeholder.implicitWidth) + leftPadding + rightPadding
|| Math.max(contentWidth, implicitPlaceholderWidth) + leftPadding + rightPadding
implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
contentHeight + topPadding + bottomPadding,
placeholder.implicitHeight + topPadding + bottomPadding)
Expand Down
Loading