Widgets: renamed SizeMultiplier => SizeRatio. Enforced read-only on size property
This commit is contained in:
parent
269b2765cd
commit
1ab3463e6d
16 changed files with 27 additions and 23 deletions
|
|
@ -8,8 +8,9 @@ Rectangle {
|
|||
id: root
|
||||
|
||||
// Multiplier to control how large the button container is relative to Style.baseWidgetSize
|
||||
property real sizeMultiplier: 1.0
|
||||
property real size: Style.baseWidgetSize * sizeMultiplier * scaling
|
||||
property real sizeRatio: 1.0
|
||||
readonly property real size: Style.baseWidgetSize * sizeRatio * scaling
|
||||
|
||||
property string icon
|
||||
property string tooltipText
|
||||
property bool enabled: true
|
||||
|
|
@ -27,6 +28,9 @@ Rectangle {
|
|||
signal exited
|
||||
signal clicked
|
||||
|
||||
|
||||
|
||||
|
||||
implicitWidth: size
|
||||
implicitHeight: size
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Item {
|
|||
property color iconCircleColor: Color.mPrimary
|
||||
property color iconTextColor: Color.mSurface
|
||||
property color collapsedIconColor: Color.mOnSurface
|
||||
property real sizeMultiplier: 0.8
|
||||
property real sizeRatio: 0.8
|
||||
property bool autoHide: false
|
||||
property bool forceOpen: false
|
||||
property bool disableOpen: false
|
||||
|
|
@ -34,8 +34,8 @@ Item {
|
|||
property bool shouldAnimateHide: false
|
||||
|
||||
// Exposed width logic
|
||||
readonly property int pillHeight: Style.baseWidgetSize * sizeMultiplier * scaling
|
||||
readonly property int iconSize: Style.baseWidgetSize * sizeMultiplier * scaling
|
||||
readonly property int pillHeight: Style.baseWidgetSize * sizeRatio * scaling
|
||||
readonly property int iconSize: Style.baseWidgetSize * sizeRatio * scaling
|
||||
readonly property int pillPaddingHorizontal: Style.marginM * scaling
|
||||
readonly property int pillOverlap: iconSize * 0.5
|
||||
readonly property int maxPillWidth: Math.max(1, textItem.implicitWidth + pillPaddingHorizontal * 2 + pillOverlap)
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ NBox {
|
|||
|
||||
NIconButton {
|
||||
icon: "close"
|
||||
size: 20 * scaling
|
||||
sizeRatio: 0.6
|
||||
colorBorder: Color.applyOpacity(Color.mOutline, "40")
|
||||
colorBg: Color.mOnSurface
|
||||
colorFg: Color.mOnPrimary
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ Item {
|
|||
color: Color.mOnSurface
|
||||
|
||||
fontPointSize: Style.fontSize * scaling
|
||||
sizeMultiplier: 0.8
|
||||
sizeRatio: 0.8
|
||||
Layout.alignment: Qt.AlignTop
|
||||
|
||||
onClicked: hide()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue