forked from Shinonome/dots-hyprland
bar: workspaces: use secondary container for occupied
This commit is contained in:
@@ -2,6 +2,7 @@ import "root:/"
|
|||||||
import "root:/services/"
|
import "root:/services/"
|
||||||
import "root:/modules/common"
|
import "root:/modules/common"
|
||||||
import "root:/modules/common/widgets"
|
import "root:/modules/common/widgets"
|
||||||
|
import "root:/modules/common/functions/color_utils.js" as ColorUtils
|
||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
@@ -98,15 +99,17 @@ Item {
|
|||||||
implicitWidth: workspaceButtonWidth
|
implicitWidth: workspaceButtonWidth
|
||||||
implicitHeight: workspaceButtonWidth
|
implicitHeight: workspaceButtonWidth
|
||||||
radius: Appearance.rounding.full
|
radius: Appearance.rounding.full
|
||||||
property var radiusLeft: (workspaceOccupied[index-1] && !(!activeWindow?.activated && monitor.activeWorkspace?.id === index)) ? 0 : Appearance.rounding.full
|
property var leftOccupied: (workspaceOccupied[index-1] && !(!activeWindow?.activated && monitor.activeWorkspace?.id === index))
|
||||||
property var radiusRight: (workspaceOccupied[index+1] && !(!activeWindow?.activated && monitor.activeWorkspace?.id === index+2)) ? 0 : Appearance.rounding.full
|
property var rightOccupied: (workspaceOccupied[index+1] && !(!activeWindow?.activated && monitor.activeWorkspace?.id === index+2))
|
||||||
|
property var radiusLeft: leftOccupied ? 0 : Appearance.rounding.full
|
||||||
|
property var radiusRight: rightOccupied ? 0 : Appearance.rounding.full
|
||||||
|
|
||||||
topLeftRadius: radiusLeft
|
topLeftRadius: radiusLeft
|
||||||
bottomLeftRadius: radiusLeft
|
bottomLeftRadius: radiusLeft
|
||||||
topRightRadius: radiusRight
|
topRightRadius: radiusRight
|
||||||
bottomRightRadius: radiusRight
|
bottomRightRadius: radiusRight
|
||||||
|
|
||||||
color: Appearance.colors.colLayer2
|
color: ColorUtils.transparentize(Appearance.m3colors.m3secondaryContainer, 0.4)
|
||||||
opacity: (workspaceOccupied[index] && !(!activeWindow?.activated && monitor.activeWorkspace?.id === index+1)) ? 1 : 0
|
opacity: (workspaceOccupied[index] && !(!activeWindow?.activated && monitor.activeWorkspace?.id === index+1)) ? 1 : 0
|
||||||
|
|
||||||
Behavior on opacity {
|
Behavior on opacity {
|
||||||
@@ -203,7 +206,7 @@ Item {
|
|||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
color: (monitor.activeWorkspace?.id == button.workspaceValue) ?
|
color: (monitor.activeWorkspace?.id == button.workspaceValue) ?
|
||||||
Appearance.m3colors.m3onPrimary :
|
Appearance.m3colors.m3onPrimary :
|
||||||
(workspaceOccupied[index] ? Appearance.colors.colOnLayer1 :
|
(workspaceOccupied[index] ? Appearance.m3colors.m3onSecondaryContainer :
|
||||||
Appearance.colors.colOnLayer1Inactive)
|
Appearance.colors.colOnLayer1Inactive)
|
||||||
|
|
||||||
Behavior on opacity {
|
Behavior on opacity {
|
||||||
|
|||||||
Reference in New Issue
Block a user