Merge upstream quattro for the Qt 6.12 palette fix (#14553)
Qt 6.12 shadows the bare Color singleton, so the bar and every Color role read undefined on fresh installs. Keep our I18n text in the four conflicting files, qualify #14433's notification button color, give the new dictation menu rows and notifications Chinese, and drop table entries for the removed Voxtype and FIDO2 texts.
This commit is contained in:
commit
fcd681c099
239 files changed
+3996
-616
No files matched your search
+11
-10
@@ -3,6 +3,7 @@ import Quickshell.Io
|
||||
import Quickshell.Wayland
|
||||
import QtQuick
|
||||
import qs.Commons
|
||||
import qs.Commons as Commons
|
||||
import qs.Ui
|
||||
import "MenuModel.js" as MenuModel
|
||||
|
||||
@@ -84,17 +85,17 @@ Item {
|
||||
property bool deleteConfirmOpen: false
|
||||
property var deleteTarget: null
|
||||
onOpenedChanged: if (!opened) { deleteConfirmOpen = false; deleteTarget = null }
|
||||
// Bound to the central [menu] section in shell.toml via Color.qml.
|
||||
// Bound to the central [menu] section in shell.toml via Commons.Color.qml.
|
||||
// Each color already includes its alpha companion (composed in the
|
||||
// singleton), so consumers can drop them straight into a Rectangle.
|
||||
property color background: Color.menu.background
|
||||
property color foreground: Color.menu.text
|
||||
property color border: Color.menu.border
|
||||
property color background: Commons.Color.menu.background
|
||||
property color foreground: Commons.Color.menu.text
|
||||
property color border: Commons.Color.menu.border
|
||||
property var borderSpec: Border.surfaceSpec("menu", "border", border, Math.max(1, Style.space(2)))
|
||||
property color scrim: Color.menu.scrim
|
||||
property color selectedBackground: Color.menu.selectedBackground
|
||||
property color selectedText: Color.menu.selectedText
|
||||
property color selectedBorder: Color.menu.selectedBorder
|
||||
property color scrim: Commons.Color.menu.scrim
|
||||
property color selectedBackground: Commons.Color.menu.selectedBackground
|
||||
property color selectedText: Commons.Color.menu.selectedText
|
||||
property color selectedBorder: Commons.Color.menu.selectedBorder
|
||||
property var selectedBorderSpec: Border.surfaceSpec("menu", "selected-border", selectedBorder, 0)
|
||||
readonly property real rowReservedBorderLeft: Border.left(selectedBorderSpec)
|
||||
readonly property real rowReservedBorderRight: Border.right(selectedBorderSpec)
|
||||
@@ -1088,7 +1089,7 @@ Item {
|
||||
// then on the card grows and shrinks downward instead of re-centering
|
||||
// on every resize, which made the menu jump around. The rows height is
|
||||
// frozen at the same moment, so the starting menu also caps how tall the
|
||||
// card may grow from there. Closing unfreezes both.
|
||||
// card may grow from there. Closing or changing screens unfreezes both.
|
||||
property int cardTop: -1
|
||||
property int maxRowsHeight: -1
|
||||
readonly property int centeredTop: Math.max(Style.gapsOut, Math.round((height - root.cardHeight) / 2))
|
||||
@@ -1099,8 +1100,8 @@ Item {
|
||||
maxRowsHeight = root.visibleRowsHeight
|
||||
}
|
||||
}
|
||||
// The surface stays mapped between opens, so closing is shown going false.
|
||||
onShownChanged: if (!shown) { cardTop = -1; maxRowsHeight = -1 }
|
||||
onTargetScreenChanged: { cardTop = -1; maxRowsHeight = -1 }
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
|
||||
@@ -413,6 +413,7 @@ var GUARD_READERS = [
|
||||
"omarchy-default-browser",
|
||||
"omarchy-default-editor",
|
||||
"omarchy-default-terminal",
|
||||
"omarchy-default-dictation",
|
||||
"omarchy-dns",
|
||||
"omarchy-region",
|
||||
"omarchy-language"
|
||||
|
||||
Reference in new issue
Block a user