Skip to content

fix(slider): optimize tick label alignment to prevent text overflow #598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
add-uos wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(slider): optimize tick label alignment to prevent text overflow #598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 24 additions & 9 deletions qt6/src/qml/SliderTipItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2022 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand All @@ -14,6 +14,21 @@ Control {
readonly property int direction: parent.parent.tickDirection
readonly property bool horizontal: parent.parent.children[0].horizontal
property bool highlight
readonly property bool isFirst: {
var ticks = parent.parent.ticks || []
return ticks.indexOf(control) === 0
}
readonly property bool isLast: {
var ticks = parent.parent.ticks || []
return ticks.indexOf(control) === ticks.length - 1
Comment on lines +21 to +23
Copy link
Copy Markdown

@sourcery-ai sourcery-ai bot Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue: Guard against ticks being empty when computing isLast.

Because ticks = parent.parent.ticks || [] can be [], ticks.indexOf(control) and ticks.length - 1 are both -1, so isLast evaluates to true when there are no ticks. If an empty tick list is possible, this will incorrectly treat the label as the last tick and apply the outward alignment. Consider guarding with ticks.length > 0, e.g. return ticks.length > 0 && ticks.indexOf(control) === ticks.length - 1.

}
// Align first/last tick labels outward to prevent text overflow at slider edges
readonly property int effectiveHorizontalAlignment: {
if (!horizontal) return textHorizontalAlignment
if (isFirst) return Text.AlignLeft
if (isLast) return Text.AlignRight
return textHorizontalAlignment
}

property D.Palette tickColor: DS.Style.slider.tick.background
property D.Palette textColor: highlight ? DS.Style.checkedButton.text: DS.Style.button.text
Expand All @@ -36,16 +51,16 @@ Control {
active: text.length !== 0
anchors {
top: horizontal ? (TipsSlider.TickDirection.Back === direction ? __rect.bottom : undefined) : undefined
topMargin: horizontal && (TipsSlider.TickDirection.Back === direction) ? DS.Style.slider.tick.vPadding : undefined
topMargin: horizontal && (TipsSlider.TickDirection.Back === direction) ? DS.Style.slider.tick.vPadding : -DS.Style.slider.tick.vPadding
bottom: horizontal ? (TipsSlider.TickDirection.Front === direction ? __rect.top : undefined) : undefined
bottomMargin: horizontal && (TipsSlider.TickDirection.Front === direction) ? DS.Style.slider.tick.vPadding : undefined
left: horizontal ? (Text.AlignLeft === textHorizontalAlignment ? __rect.left : undefined)
bottomMargin: horizontal && (TipsSlider.TickDirection.Front === direction) ? DS.Style.slider.tick.vPadding : -DS.Style.slider.tick.vPadding
left: horizontal ? (Text.AlignLeft === effectiveHorizontalAlignment ? __rect.left : undefined)
: (TipsSlider.TickDirection.Back === direction ? __rect.right : undefined)
leftMargin: !horizontal && TipsSlider.TickDirection.Back === direction ? DS.Style.slider.tick.hPadding : undefined
right: horizontal ? (Text.AlignRight === textHorizontalAlignment ? __rect.right : undefined)
leftMargin: !horizontal && TipsSlider.TickDirection.Back === direction ? DS.Style.slider.tick.hPadding : -DS.Style.slider.tick.hPadding
right: horizontal ? (Text.AlignRight === effectiveHorizontalAlignment ? __rect.right : undefined)
: (TipsSlider.TickDirection.Front === direction ? __rect.left : undefined)
rightMargin: !horizontal && TipsSlider.TickDirection.Front === direction ? DS.Style.slider.tick.hPadding : undefined
horizontalCenter: horizontal && Text.AlignHCenter === textHorizontalAlignment ? __rect.horizontalCenter : undefined
rightMargin: !horizontal && TipsSlider.TickDirection.Front === direction ? DS.Style.slider.tick.hPadding : -DS.Style.slider.tick.hPadding
horizontalCenter: horizontal && Text.AlignHCenter === effectiveHorizontalAlignment ? __rect.horizontalCenter : undefined
verticalCenter: horizontal ? undefined : __rect.verticalCenter
}

Expand All @@ -55,7 +70,7 @@ Control {
leftPadding: rightPadding
topPadding: highlight ? DS.Style.slider.tick.vPadding : 0
bottomPadding: topPadding
horizontalAlignment: textHorizontalAlignment
horizontalAlignment: control.effectiveHorizontalAlignment
verticalAlignment: Text.AlignVCenter
palette.windowText: control.D.ColorSelector.textColor
background: Loader {
Expand Down
Loading