Fix vertical bar indicator alignment
This commit is contained in:
@@ -1,5 +1,6 @@
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import Quickshell
|
import Quickshell
|
||||||
|
import Quickshell.Io
|
||||||
import qs.Commons
|
import qs.Commons
|
||||||
import qs.Ui
|
import qs.Ui
|
||||||
|
|
||||||
@@ -8,6 +9,9 @@ BarWidget {
|
|||||||
moduleName: "indicators"
|
moduleName: "indicators"
|
||||||
|
|
||||||
readonly property bool vertical: bar ? bar.vertical : false
|
readonly property bool vertical: bar ? bar.vertical : false
|
||||||
|
readonly property int barSize: bar ? bar.barSize : Style.bar.sizeHorizontal
|
||||||
|
readonly property int indicatorSlotExtent: Style.space(22)
|
||||||
|
readonly property int inactiveSlotExtent: indicatorEntries.length * indicatorSlotExtent
|
||||||
readonly property var indicatorEntries: indicatorEntriesFromSettings(settings)
|
readonly property var indicatorEntries: indicatorEntriesFromSettings(settings)
|
||||||
property var activeIndicatorIds: []
|
property var activeIndicatorIds: []
|
||||||
property var indicatorActiveStates: ({})
|
property var indicatorActiveStates: ({})
|
||||||
@@ -200,8 +204,8 @@ BarWidget {
|
|||||||
Item {
|
Item {
|
||||||
id: inactiveHorizontalArea
|
id: inactiveHorizontalArea
|
||||||
|
|
||||||
implicitWidth: inactiveHorizontalBlock.implicitWidth
|
implicitWidth: Math.max(inactiveHorizontalBlock.implicitWidth, root.inactiveSlotExtent)
|
||||||
implicitHeight: inactiveHorizontalBlock.implicitHeight
|
implicitHeight: Math.max(inactiveHorizontalBlock.implicitHeight, root.barSize)
|
||||||
width: implicitWidth
|
width: implicitWidth
|
||||||
height: implicitHeight
|
height: implicitHeight
|
||||||
|
|
||||||
@@ -241,8 +245,8 @@ BarWidget {
|
|||||||
Item {
|
Item {
|
||||||
id: inactiveVerticalArea
|
id: inactiveVerticalArea
|
||||||
|
|
||||||
implicitWidth: inactiveVerticalBlock.implicitWidth
|
implicitWidth: Math.max(inactiveVerticalBlock.implicitWidth, root.barSize)
|
||||||
implicitHeight: inactiveVerticalBlock.implicitHeight
|
implicitHeight: Math.max(inactiveVerticalBlock.implicitHeight, root.inactiveSlotExtent)
|
||||||
width: implicitWidth
|
width: implicitWidth
|
||||||
height: implicitHeight
|
height: implicitHeight
|
||||||
|
|
||||||
@@ -262,6 +266,10 @@ BarWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HoverHandler {
|
||||||
|
onHoveredChanged: root.setIndicatorAreaHovered(hovered)
|
||||||
|
}
|
||||||
|
|
||||||
component ActiveIndicatorBlock: Item {
|
component ActiveIndicatorBlock: Item {
|
||||||
id: activeIndicatorBlockRoot
|
id: activeIndicatorBlockRoot
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user