forked from Shinonome/dots-hyprland
hefty: bar: workspaces: less disgusting workspace number showing logic
This commit is contained in:
@@ -373,9 +373,15 @@ HBarWidgetContainer {
|
|||||||
property bool hasBiggestWindow: !!wsModel.biggestWindow[index]
|
property bool hasBiggestWindow: !!wsModel.biggestWindow[index]
|
||||||
property int wsId: wsModel.getWorkspaceIdAt(index)
|
property int wsId: wsModel.getWorkspaceIdAt(index)
|
||||||
property color contentColor: (wsModel.occupied[wsNum.index] && wsId !== wsModel.fakeWorkspace) ? Appearance.colors.colOnSecondaryContainer : Appearance.colors.colOnLayer1Inactive
|
property color contentColor: (wsModel.occupied[wsNum.index] && wsId !== wsModel.fakeWorkspace) ? Appearance.colors.colOnSecondaryContainer : Appearance.colors.colOnLayer1Inactive
|
||||||
|
property bool showingNumbers: {
|
||||||
|
if (root.superPressAndHeld) return true;
|
||||||
|
if (GlobalStates.screenLocked) return false;
|
||||||
|
if (Config.options?.bar.workspaces.alwaysShowNumbers && (!Config.options?.bar.workspaces.showAppIcons || !wsNum.hasBiggestWindow)) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
FadeLoader {
|
FadeLoader {
|
||||||
shown: !(Config.options?.bar.workspaces.alwaysShowNumbers || root.superPressAndHeld || (Config.options?.bar.workspaces.showAppIcons && wsNum.hasBiggestWindow))
|
shown: !wsNum.showingNumbers
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
Circle {
|
Circle {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
@@ -384,7 +390,7 @@ HBarWidgetContainer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
FadeLoader {
|
FadeLoader {
|
||||||
shown: root.superPressAndHeld || ((Config.options?.bar.workspaces.alwaysShowNumbers && (!Config.options?.bar.workspaces.showAppIcons || !wsNum.hasBiggestWindow || root.showNumbers)) || (root.superPressAndHeld && !Config.options?.bar.workspaces.showAppIcons))
|
shown: wsNum.showingNumbers
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
StyledText {
|
StyledText {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
|
|||||||
Reference in New Issue
Block a user