Commit 9282d380 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch '2004'

parents 8ca29cdd a0475858
Pipeline #17362 passed with stage
in 13 minutes and 47 seconds
......@@ -782,7 +782,7 @@ void MainWindow::updateActionsToolTip()
// find the shortcut pattern and delete (note the preceding space in the RegEx)
QString strippedTooltip = tempAction->toolTip().remove(QRegExp(QStringLiteral("\\s\\(.*\\)")));
// append shortcut if it exists for action
if (tempAction->shortcut() == QKeySequence(0)) {
if (tempAction->shortcut() == QKeySequence()) {
tempAction->setToolTip(strippedTooltip);
} else {
tempAction->setToolTip(strippedTooltip + QStringLiteral(" (") + tempAction->shortcut().toString() + QLatin1Char(')'));
......
......@@ -34,7 +34,7 @@ Rectangle {
property bool current: false
property int myTrackHeight
property int trackId : -42
property int buttonSize: root.baseUnit * 1.8
property int buttonSize: root.collapsedHeight
property int iconSize: buttonSize - 4
property string trackTag
property int thumbsFormat: 0
......@@ -187,7 +187,7 @@ Rectangle {
ToolButton {
id: expandButton
anchors.left: trackHeadColumn.left
anchors.left: parent.left
height: trackHeadRoot.buttonSize
width: trackHeadRoot.buttonSize
focusPolicy: Qt.NoFocus
......@@ -222,7 +222,8 @@ Rectangle {
background: Rectangle {
color: trackLed.bgColor
}
width: fontMetrics.boundingRect("M").width * trackLed.text.length
width: fontMetrics.boundingRect("M").width * trackHeadRoot.trackTag.length
height: trackHeadRoot.buttonSize
y: 1
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment