Qualify shell palette references for Qt 6.12 (#14553)
This commit is contained in:
1 parent
902fd8aebd
commit
b83d3df084
74 files changed
+381
-293
No files matched your search
@@ -282,7 +282,7 @@ assert(
|
||||
'bar uses nearest insertion targeting for widget and free-space drops'
|
||||
)
|
||||
assert(
|
||||
/component DragGhostPanel:[\s\S]*?readonly property var targetRect: root\.barDragTargetGeometry[\s\S]*?color: Color\.accent/.test(barSource),
|
||||
/component DragGhostPanel:[\s\S]*?readonly property var targetRect: root\.barDragTargetGeometry[\s\S]*?color: Commons\.Color\.accent/.test(barSource),
|
||||
'bar draws the insertion marker above the bar in the drag overlay'
|
||||
)
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import qs.Commons
|
||||
import qs.Commons as Commons
|
||||
import "background" as BackgroundPlugin
|
||||
|
||||
ShellRoot {
|
||||
@@ -24,10 +25,10 @@ ShellRoot {
|
||||
interval: 1300
|
||||
running: true
|
||||
onTriggered: {
|
||||
if (Qt.colorEqual(Color.accent, "#123456")) {
|
||||
if (Qt.colorEqual(Commons.Color.accent, "#123456")) {
|
||||
console.log("RESULT pass")
|
||||
} else {
|
||||
console.log("RESULT fail previous colors returned: " + Color.accent)
|
||||
console.log("RESULT fail previous colors returned: " + Commons.Color.accent)
|
||||
}
|
||||
Qt.quit()
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import QtQuick
|
||||
import Quickshell
|
||||
import Quickshell.Networking
|
||||
import qs.Commons
|
||||
import qs.Commons as Commons
|
||||
import "mocks"
|
||||
import "network" as Network
|
||||
|
||||
@@ -21,9 +22,9 @@ ShellRoot {
|
||||
Network.Panel {
|
||||
id: panel
|
||||
bar: QtObject {
|
||||
property color foreground: Color.foreground
|
||||
property color barForeground: Color.foreground
|
||||
property color urgent: Color.urgent
|
||||
property color foreground: Commons.Color.foreground
|
||||
property color barForeground: Commons.Color.foreground
|
||||
property color urgent: Commons.Color.urgent
|
||||
property string fontFamily: Style.font.family
|
||||
property string position: "top"
|
||||
property int barSize: 24
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import QtQuick
|
||||
import Quickshell
|
||||
import qs.Commons
|
||||
import qs.Commons as Commons
|
||||
import "mocks"
|
||||
import "network" as Network
|
||||
import "network/Model.js" as Model
|
||||
@@ -25,9 +26,9 @@ ShellRoot {
|
||||
Network.Panel {
|
||||
id: panel
|
||||
bar: QtObject {
|
||||
property color foreground: Color.foreground
|
||||
property color barForeground: Color.foreground
|
||||
property color urgent: Color.urgent
|
||||
property color foreground: Commons.Color.foreground
|
||||
property color barForeground: Commons.Color.foreground
|
||||
property color urgent: Commons.Color.urgent
|
||||
property string fontFamily: Style.font.family
|
||||
property string position: "top"
|
||||
property int barSize: 24
|
||||
|
||||
@@ -11,7 +11,7 @@ const widget = read('shell/plugins/bar/widgets/Indicators.qml')
|
||||
const manifest = JSON.parse(read('shell/plugins/bar/widgets/Indicators.manifest.json'))
|
||||
assert(widget.match(/defaultIndicatorEntries: \[ "PasswordlessSudo", "Dictation"/), 'passwordless sudo is included in the default indicator tray')
|
||||
assert(manifest.barWidget.schema.find(field => field.key === 'items').options.some(option => option.value === 'PasswordlessSudo'), 'passwordless sudo is configurable alongside Night Light')
|
||||
assert(indicator.includes('useActiveColor: true') && indicator.includes('activeColor: Color.urgent'), 'active passwordless sudo uses the theme danger color')
|
||||
assert(indicator.includes('useActiveColor: true') && indicator.includes('activeColor: Commons.Color.urgent'), 'active passwordless sudo uses the theme danger color')
|
||||
assertEqual(indicator.match(/activeText: "([^"]+)"/)[1], indicator.match(/inactiveText: "([^"]+)"/)[1], 'sudo keeps the same icon in both states')
|
||||
assert(!widget.includes('sudoHorizontal') && !widget.includes('sudoVertical'), 'sudo participates in the normal indicator blocks')
|
||||
assert(!indicator.includes('visible:'), 'sudo uses the shared indicator visibility and hover behavior')
|
||||
|
||||
Reference in new issue
Block a user