diff --git a/quickshell/Modals/Changelog/ChangelogModal.qml b/quickshell/Modals/Changelog/ChangelogModal.qml index 85221afa..290855b6 100644 --- a/quickshell/Modals/Changelog/ChangelogModal.qml +++ b/quickshell/Modals/Changelog/ChangelogModal.qml @@ -7,6 +7,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true readonly property int modalWidth: 680 readonly property int modalHeight: screen ? Math.min(720, screen.height - 80) : 720 diff --git a/quickshell/Modals/FileBrowser/FileBrowserModal.qml b/quickshell/Modals/FileBrowser/FileBrowserModal.qml index 338fa864..c7686ca7 100644 --- a/quickshell/Modals/FileBrowser/FileBrowserModal.qml +++ b/quickshell/Modals/FileBrowser/FileBrowserModal.qml @@ -6,6 +6,7 @@ import qs.Widgets FloatingWindow { id: fileBrowserModal + property bool disablePopupTransparency: true property string browserTitle: "Select File" property string browserIcon: "folder_open" property string browserType: "generic" diff --git a/quickshell/Modals/Greeter/GreeterModal.qml b/quickshell/Modals/Greeter/GreeterModal.qml index 1d4bcf33..973dab2b 100644 --- a/quickshell/Modals/Greeter/GreeterModal.qml +++ b/quickshell/Modals/Greeter/GreeterModal.qml @@ -8,6 +8,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true property int currentPage: 0 readonly property int totalPages: 3 readonly property var pageComponents: [welcomePage, doctorPage, completePage] diff --git a/quickshell/Modals/PolkitAuthModal.qml b/quickshell/Modals/PolkitAuthModal.qml index f0a2e552..d714cdeb 100644 --- a/quickshell/Modals/PolkitAuthModal.qml +++ b/quickshell/Modals/PolkitAuthModal.qml @@ -7,6 +7,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true property string passwordInput: "" property var currentFlow: PolkitService.agent?.flow property bool isLoading: false diff --git a/quickshell/Modals/ProcessListModal.qml b/quickshell/Modals/ProcessListModal.qml index 7d2f14b6..e6e423c0 100644 --- a/quickshell/Modals/ProcessListModal.qml +++ b/quickshell/Modals/ProcessListModal.qml @@ -10,6 +10,7 @@ import qs.Widgets FloatingWindow { id: processListModal + property bool disablePopupTransparency: true property int currentTab: 0 property string searchText: "" property string expandedPid: "" diff --git a/quickshell/Modals/Settings/SettingsModal.qml b/quickshell/Modals/Settings/SettingsModal.qml index 88fe8020..2ef74f21 100644 --- a/quickshell/Modals/Settings/SettingsModal.qml +++ b/quickshell/Modals/Settings/SettingsModal.qml @@ -8,6 +8,7 @@ import qs.Widgets FloatingWindow { id: settingsModal + property bool disablePopupTransparency: true property var profileBrowser: profileBrowserLoader.item property var wallpaperBrowser: wallpaperBrowserLoader.item diff --git a/quickshell/Modals/Settings/SettingsSidebar.qml b/quickshell/Modals/Settings/SettingsSidebar.qml index 134f9c51..0c3ffcad 100644 --- a/quickshell/Modals/Settings/SettingsSidebar.qml +++ b/quickshell/Modals/Settings/SettingsSidebar.qml @@ -498,7 +498,7 @@ Rectangle { implicitWidth: __calculatedWidth width: __calculatedWidth height: parent.height - color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) + color: Theme.surfaceContainer radius: Theme.cornerRadius StyledTextMetrics { @@ -596,12 +596,12 @@ Rectangle { id: searchField width: parent.width - parent.leftPadding - parent.rightPadding placeholderText: I18n.tr("Search...") - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) normalBorderColor: Theme.outlineMedium focusedBorderColor: Theme.primary leftIconName: "search" leftIconSize: Theme.iconSize - 4 showClearButton: text.length > 0 + usePopupTransparency: false onTextChanged: { SettingsSearchService.search(text); root.searchSelectedIndex = 0; diff --git a/quickshell/Modals/WifiPasswordModal.qml b/quickshell/Modals/WifiPasswordModal.qml index d63c9d20..e2ab271a 100644 --- a/quickshell/Modals/WifiPasswordModal.qml +++ b/quickshell/Modals/WifiPasswordModal.qml @@ -7,6 +7,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true property string wifiPasswordSSID: "" property string wifiPasswordInput: "" property string wifiUsernameInput: "" diff --git a/quickshell/Modals/WindowRuleModal.qml b/quickshell/Modals/WindowRuleModal.qml index b7216e50..ed19c4c4 100644 --- a/quickshell/Modals/WindowRuleModal.qml +++ b/quickshell/Modals/WindowRuleModal.qml @@ -7,6 +7,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true property var editingRule: null property bool isEditMode: editingRule !== null property bool isNiri: CompositorService.isNiri diff --git a/quickshell/Modals/WorkspaceRenameModal.qml b/quickshell/Modals/WorkspaceRenameModal.qml index f4c0fa2b..6519ac37 100644 --- a/quickshell/Modals/WorkspaceRenameModal.qml +++ b/quickshell/Modals/WorkspaceRenameModal.qml @@ -8,6 +8,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true readonly property int inputFieldHeight: Theme.fontSizeMedium + Theme.spacingL * 2 objectName: "workspaceRenameModal" diff --git a/quickshell/Modules/Settings/AboutTab.qml b/quickshell/Modules/Settings/AboutTab.qml index 1800f2f1..64cb7c80 100644 --- a/quickshell/Modules/Settings/AboutTab.qml +++ b/quickshell/Modules/Settings/AboutTab.qml @@ -122,7 +122,7 @@ Item { width: parent.width height: asciiSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 @@ -541,7 +541,7 @@ Item { width: parent.width height: projectSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 @@ -599,7 +599,7 @@ Item { width: parent.width height: backendSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 @@ -760,7 +760,7 @@ Item { width: parent.width height: toolsSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 diff --git a/quickshell/Modules/Settings/DesktopWidgetBrowser.qml b/quickshell/Modules/Settings/DesktopWidgetBrowser.qml index 7de37f46..4c235964 100644 --- a/quickshell/Modules/Settings/DesktopWidgetBrowser.qml +++ b/quickshell/Modules/Settings/DesktopWidgetBrowser.qml @@ -9,6 +9,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true property string searchQuery: "" property var filteredWidgets: [] property int selectedIndex: -1 @@ -273,7 +274,7 @@ FloatingWindow { width: parent.width height: 48 cornerRadius: Theme.cornerRadius - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHigh normalBorderColor: Theme.outlineMedium focusedBorderColor: Theme.primary leftIconName: "search" diff --git a/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml b/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml index 4bf9ed9b..4852d6b3 100644 --- a/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml +++ b/quickshell/Modules/Settings/DesktopWidgetInstanceCard.qml @@ -84,7 +84,7 @@ SettingsCard { onClosed: root.confirmingDelete = false background: Rectangle { - color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) + color: Theme.surfaceContainer radius: Theme.cornerRadius border.color: Theme.outlineLight border.width: 1 diff --git a/quickshell/Modules/Settings/DisplayConfig/NoBackendMessage.qml b/quickshell/Modules/Settings/DisplayConfig/NoBackendMessage.qml index 93db8c88..039921ce 100644 --- a/quickshell/Modules/Settings/DisplayConfig/NoBackendMessage.qml +++ b/quickshell/Modules/Settings/DisplayConfig/NoBackendMessage.qml @@ -8,7 +8,7 @@ StyledRect { width: parent.width height: messageContent.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 diff --git a/quickshell/Modules/Settings/DisplayConfigTab.qml b/quickshell/Modules/Settings/DisplayConfigTab.qml index 82874c88..a0cbc857 100644 --- a/quickshell/Modules/Settings/DisplayConfigTab.qml +++ b/quickshell/Modules/Settings/DisplayConfigTab.qml @@ -90,7 +90,7 @@ Item { width: parent.width height: profileSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 visible: DisplayConfigState.hasOutputBackend @@ -325,7 +325,7 @@ Item { width: parent.width height: monitorConfigSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 visible: DisplayConfigState.hasOutputBackend diff --git a/quickshell/Modules/Settings/DisplayWidgetsTab.qml b/quickshell/Modules/Settings/DisplayWidgetsTab.qml index 07ca25f2..0e5d449f 100644 --- a/quickshell/Modules/Settings/DisplayWidgetsTab.qml +++ b/quickshell/Modules/Settings/DisplayWidgetsTab.qml @@ -136,7 +136,7 @@ Item { width: parent.width height: screensInfoSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 @@ -249,7 +249,7 @@ Item { width: parent.width height: screenRow.implicitHeight + Theme.spacingS * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.3) border.width: 0 @@ -329,7 +329,7 @@ Item { width: parent.width height: componentSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 diff --git a/quickshell/Modules/Settings/GammaControlTab.qml b/quickshell/Modules/Settings/GammaControlTab.qml index 1d81f554..5ac4ecc0 100644 --- a/quickshell/Modules/Settings/GammaControlTab.qml +++ b/quickshell/Modules/Settings/GammaControlTab.qml @@ -38,7 +38,7 @@ Item { width: parent.width height: gammaSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: 0 diff --git a/quickshell/Modules/Settings/KeybindsTab.qml b/quickshell/Modules/Settings/KeybindsTab.qml index 672b1960..c030b084 100644 --- a/quickshell/Modules/Settings/KeybindsTab.qml +++ b/quickshell/Modules/Settings/KeybindsTab.qml @@ -183,7 +183,7 @@ Item { height: headerSection.implicitHeight + Theme.spacingL * 2 anchors.horizontalCenter: parent.horizontalCenter radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 Column { @@ -361,7 +361,7 @@ Item { height: categorySection.implicitHeight + Theme.spacingL * 2 anchors.horizontalCenter: parent.horizontalCenter radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 Column { @@ -439,7 +439,7 @@ Item { height: newBindSection.implicitHeight + Theme.spacingL * 2 anchors.horizontalCenter: parent.horizontalCenter radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.color: Theme.outlineVariant border.width: 1 visible: keybindsTab.showingNewBind @@ -497,7 +497,7 @@ Item { height: bindsListHeader.implicitHeight + Theme.spacingL * 2 anchors.horizontalCenter: parent.horizontalCenter radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 Column { diff --git a/quickshell/Modules/Settings/NetworkTab.qml b/quickshell/Modules/Settings/NetworkTab.qml index e45874f6..fb9d7f7f 100644 --- a/quickshell/Modules/Settings/NetworkTab.qml +++ b/quickshell/Modules/Settings/NetworkTab.qml @@ -107,7 +107,7 @@ Item { width: parent.width height: overviewSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { id: overviewSection @@ -291,7 +291,7 @@ Item { width: parent.width height: ethernetSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh visible: NetworkService.ethernetConnected || (NetworkService.ethernetDevices?.length ?? 0) > 0 Column { @@ -762,7 +762,7 @@ Item { width: parent.width height: wifiSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { id: wifiSection @@ -1480,7 +1480,7 @@ Item { width: parent.width height: vpnSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh visible: DMSNetworkService.vpnAvailable Column { diff --git a/quickshell/Modules/Settings/PluginBrowser.qml b/quickshell/Modules/Settings/PluginBrowser.qml index db0b2d9f..2d600fa5 100644 --- a/quickshell/Modules/Settings/PluginBrowser.qml +++ b/quickshell/Modules/Settings/PluginBrowser.qml @@ -9,6 +9,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true property var allPlugins: [] property string searchQuery: "" property var filteredPlugins: [] @@ -331,7 +332,7 @@ FloatingWindow { anchors.topMargin: Theme.spacingM height: 48 cornerRadius: Theme.cornerRadius - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHigh normalBorderColor: Theme.outlineMedium focusedBorderColor: Theme.primary leftIconName: "search" @@ -718,6 +719,8 @@ FloatingWindow { FloatingWindow { id: thirdPartyConfirmModal + property bool disablePopupTransparency: true + function show() { visible = true; } diff --git a/quickshell/Modules/Settings/PluginListItem.qml b/quickshell/Modules/Settings/PluginListItem.qml index e8325723..c783ad3f 100644 --- a/quickshell/Modules/Settings/PluginListItem.qml +++ b/quickshell/Modules/Settings/PluginListItem.qml @@ -52,7 +52,7 @@ StyledRect { width: parent.width height: pluginItemColumn.implicitHeight + Theme.spacingM * 2 + settingsContainer.height radius: Theme.cornerRadius - color: (pluginMouseArea.containsMouse || updateArea.containsMouse || uninstallArea.containsMouse || reloadArea.containsMouse) ? Theme.surfacePressed : (isExpanded ? Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) : Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency)) + color: (pluginMouseArea.containsMouse || updateArea.containsMouse || uninstallArea.containsMouse || reloadArea.containsMouse) ? Theme.surfacePressed : (isExpanded ? Theme.surfaceContainerHighest : Theme.surfaceContainerHigh) border.width: 0 MouseArea { @@ -183,7 +183,7 @@ StyledRect { width: 28 height: 28 radius: 14 - color: updateArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) : "transparent" + color: updateArea.containsMouse ? Theme.surfaceContainerHighest : "transparent" visible: DMSService.dmsAvailable && root.isLoaded && root.hasUpdate && !root.isSystemPlugin DankIcon { @@ -227,7 +227,7 @@ StyledRect { width: 28 height: 28 radius: 14 - color: uninstallArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) : "transparent" + color: uninstallArea.containsMouse ? Theme.surfaceContainerHighest : "transparent" visible: DMSService.dmsAvailable && !root.isSystemPlugin DankIcon { @@ -270,7 +270,7 @@ StyledRect { width: 28 height: 28 radius: 14 - color: reloadArea.containsMouse ? Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) : "transparent" + color: reloadArea.containsMouse ? Theme.surfaceContainerHighest : "transparent" visible: root.isLoaded DankIcon { @@ -388,7 +388,7 @@ StyledRect { Rectangle { anchors.fill: parent - color: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) + color: Theme.surfaceContainerHighest radius: Theme.cornerRadius anchors.topMargin: Theme.spacingXS border.width: 0 diff --git a/quickshell/Modules/Settings/PluginsTab.qml b/quickshell/Modules/Settings/PluginsTab.qml index 5d5bcdbb..1c6f46d6 100644 --- a/quickshell/Modules/Settings/PluginsTab.qml +++ b/quickshell/Modules/Settings/PluginsTab.qml @@ -41,7 +41,7 @@ FocusScope { width: parent.width height: headerColumn.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 Column { @@ -243,7 +243,7 @@ FocusScope { width: parent.width height: directoryColumn.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 Column { @@ -286,7 +286,7 @@ FocusScope { width: parent.width height: Math.max(200, availableColumn.implicitHeight + Theme.spacingL * 2) radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 Column { diff --git a/quickshell/Modules/Settings/PowerSleepTab.qml b/quickshell/Modules/Settings/PowerSleepTab.qml index ac8ebab1..4daf862e 100644 --- a/quickshell/Modules/Settings/PowerSleepTab.qml +++ b/quickshell/Modules/Settings/PowerSleepTab.qml @@ -555,7 +555,7 @@ Item { DankTextField { width: parent.width placeholderText: modelData.placeholder - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHighest normalBorderColor: Theme.outlineMedium focusedBorderColor: Theme.primary diff --git a/quickshell/Modules/Settings/PrinterTab.qml b/quickshell/Modules/Settings/PrinterTab.qml index c0a36960..f03399b8 100644 --- a/quickshell/Modules/Settings/PrinterTab.qml +++ b/quickshell/Modules/Settings/PrinterTab.qml @@ -80,7 +80,7 @@ Item { width: parent.width height: overviewSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { id: overviewSection @@ -181,7 +181,7 @@ Item { width: parent.width height: addPrinterSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh visible: CupsService.cupsAvailable Column { @@ -498,7 +498,7 @@ Item { width: parent.width height: printersSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh visible: CupsService.cupsAvailable Column { @@ -1191,7 +1191,7 @@ Item { width: parent.width height: classesSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh visible: CupsService.cupsAvailable && CupsService.printerClasses.length > 0 Column { diff --git a/quickshell/Modules/Settings/SystemUpdaterTab.qml b/quickshell/Modules/Settings/SystemUpdaterTab.qml index 15c7baa3..5a61dbb0 100644 --- a/quickshell/Modules/Settings/SystemUpdaterTab.qml +++ b/quickshell/Modules/Settings/SystemUpdaterTab.qml @@ -70,7 +70,7 @@ Item { id: updaterCustomCommand width: parent.width placeholderText: "myPkgMngr --sysupdate" - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHighest normalBorderColor: Theme.outlineMedium focusedBorderColor: Theme.primary @@ -114,7 +114,7 @@ Item { id: updaterTerminalCustomClass width: parent.width placeholderText: "-T udpClass" - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHighest, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHighest normalBorderColor: Theme.outlineMedium focusedBorderColor: Theme.primary diff --git a/quickshell/Modules/Settings/ThemeBrowser.qml b/quickshell/Modules/Settings/ThemeBrowser.qml index a86eae84..1df32c75 100644 --- a/quickshell/Modules/Settings/ThemeBrowser.qml +++ b/quickshell/Modules/Settings/ThemeBrowser.qml @@ -9,6 +9,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true property var allThemes: [] property string searchQuery: "" property var filteredThemes: [] @@ -300,7 +301,7 @@ FloatingWindow { anchors.topMargin: Theme.spacingM height: 48 cornerRadius: Theme.cornerRadius - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHigh normalBorderColor: Theme.outlineMedium focusedBorderColor: Theme.primary leftIconName: "search" diff --git a/quickshell/Modules/Settings/TimeWeatherTab.qml b/quickshell/Modules/Settings/TimeWeatherTab.qml index 34a3a4e1..56afd0c1 100644 --- a/quickshell/Modules/Settings/TimeWeatherTab.qml +++ b/quickshell/Modules/Settings/TimeWeatherTab.qml @@ -248,7 +248,7 @@ Item { x: Theme.spacingM height: formatHelp.implicitHeight + Theme.spacingM * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { id: formatHelp @@ -808,7 +808,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { anchors.centerIn: parent @@ -852,7 +852,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { anchors.centerIn: parent @@ -896,7 +896,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { anchors.centerIn: parent @@ -953,7 +953,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { anchors.centerIn: parent @@ -1003,7 +1003,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { anchors.centerIn: parent @@ -1047,7 +1047,7 @@ Item { Layout.fillWidth: true Layout.fillHeight: true radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { anchors.centerIn: parent diff --git a/quickshell/Modules/Settings/WallpaperTab.qml b/quickshell/Modules/Settings/WallpaperTab.qml index 99168da1..9baf0a47 100644 --- a/quickshell/Modules/Settings/WallpaperTab.qml +++ b/quickshell/Modules/Settings/WallpaperTab.qml @@ -274,7 +274,7 @@ Item { return currentWallpaper && !currentWallpaper.startsWith("#") && !currentWallpaper.startsWith("we"); } opacity: enabled ? 1 : 0.5 - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHigh iconColor: Theme.surfaceText onClicked: { if (SessionData.perMonitorWallpaper) { @@ -294,7 +294,7 @@ Item { return currentWallpaper && !currentWallpaper.startsWith("#") && !currentWallpaper.startsWith("we"); } opacity: enabled ? 1 : 0.5 - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHigh iconColor: Theme.surfaceText onClicked: { if (SessionData.perMonitorWallpaper) { diff --git a/quickshell/Modules/Settings/WidgetSelectionPopup.qml b/quickshell/Modules/Settings/WidgetSelectionPopup.qml index 4c449410..817e9800 100644 --- a/quickshell/Modules/Settings/WidgetSelectionPopup.qml +++ b/quickshell/Modules/Settings/WidgetSelectionPopup.qml @@ -6,6 +6,7 @@ import qs.Widgets FloatingWindow { id: root + property bool disablePopupTransparency: true property var allWidgets: [] property string targetSection: "" property string searchQuery: "" @@ -257,7 +258,7 @@ FloatingWindow { width: parent.width height: 48 cornerRadius: Theme.cornerRadius - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHigh normalBorderColor: Theme.outlineMedium focusedBorderColor: Theme.primary leftIconName: "search" diff --git a/quickshell/Modules/Settings/Widgets/SettingsCard.qml b/quickshell/Modules/Settings/Widgets/SettingsCard.qml index f3d28989..65642a0c 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsCard.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsCard.qml @@ -37,7 +37,7 @@ StyledRect { return h; } radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh readonly property bool collapsed: collapsible && !expanded readonly property bool hasHeader: root.title !== "" || root.iconName !== "" diff --git a/quickshell/Modules/Settings/Widgets/SettingsDropdownRow.qml b/quickshell/Modules/Settings/Widgets/SettingsDropdownRow.qml index 44212901..c5ec3a6e 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsDropdownRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsDropdownRow.qml @@ -19,6 +19,7 @@ DankDropdown { width: parent?.width ?? 0 addHorizontalPadding: true + usePopupTransparency: false Rectangle { anchors.fill: parent diff --git a/quickshell/Modules/Settings/Widgets/SettingsSliderCard.qml b/quickshell/Modules/Settings/Widgets/SettingsSliderCard.qml index 87ca48fd..d633f68b 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsSliderCard.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsSliderCard.qml @@ -27,7 +27,7 @@ StyledRect { width: parent?.width ?? 0 height: Theme.spacingL * 2 + contentColumn.height radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { id: contentColumn @@ -84,7 +84,7 @@ StyledRect { iconName: "restart_alt" iconSize: 20 visible: root.defaultValue >= 0 && slider.value !== root.defaultValue - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHigh iconColor: Theme.surfaceVariantText onClicked: { slider.value = root.defaultValue; @@ -99,7 +99,7 @@ StyledRect { height: 32 showValue: true wheelEnabled: false - thumbOutlineColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + thumbOutlineColor: Theme.surfaceContainerHigh onSliderValueChanged: newValue => root.sliderValueChanged(newValue) } } diff --git a/quickshell/Modules/Settings/Widgets/SettingsSliderRow.qml b/quickshell/Modules/Settings/Widgets/SettingsSliderRow.qml index ad227081..aefde4bb 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsSliderRow.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsSliderRow.qml @@ -123,7 +123,7 @@ Item { iconName: "restart_alt" iconSize: 20 visible: root.defaultValue >= 0 && slider.value !== root.defaultValue - backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + backgroundColor: Theme.surfaceContainerHigh iconColor: Theme.surfaceVariantText onClicked: { slider.value = root.defaultValue; @@ -139,7 +139,7 @@ Item { height: 32 showValue: true wheelEnabled: false - thumbOutlineColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + thumbOutlineColor: Theme.surfaceContainerHigh onSliderValueChanged: newValue => root.sliderValueChanged(newValue) } } diff --git a/quickshell/Modules/Settings/Widgets/SettingsToggleCard.qml b/quickshell/Modules/Settings/Widgets/SettingsToggleCard.qml index e0be6a07..c36fb7c4 100644 --- a/quickshell/Modules/Settings/Widgets/SettingsToggleCard.qml +++ b/quickshell/Modules/Settings/Widgets/SettingsToggleCard.qml @@ -27,7 +27,7 @@ StyledRect { width: parent?.width ?? 0 height: Theme.spacingL * 2 + mainColumn.height radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { id: mainColumn diff --git a/quickshell/Modules/Settings/WidgetsTab.qml b/quickshell/Modules/Settings/WidgetsTab.qml index 7c3a6470..201d1bfd 100644 --- a/quickshell/Modules/Settings/WidgetsTab.qml +++ b/quickshell/Modules/Settings/WidgetsTab.qml @@ -714,7 +714,7 @@ Item { width: parent.width height: barSelectorContent.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 visible: hasMultipleBars @@ -767,7 +767,7 @@ Item { width: parent.width height: widgetManagementHeader.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 Column { @@ -867,7 +867,7 @@ Item { width: parent.width height: leftSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 WidgetsTabSection { @@ -925,7 +925,7 @@ Item { width: parent.width height: centerSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 WidgetsTabSection { @@ -983,7 +983,7 @@ Item { width: parent.width height: rightSection.implicitHeight + Theme.spacingL * 2 radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh border.width: 0 WidgetsTabSection { diff --git a/quickshell/Modules/Settings/WidgetsTabSection.qml b/quickshell/Modules/Settings/WidgetsTabSection.qml index 1de664b9..70bc8e41 100644 --- a/quickshell/Modules/Settings/WidgetsTabSection.qml +++ b/quickshell/Modules/Settings/WidgetsTabSection.qml @@ -808,7 +808,7 @@ Column { closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside background: Rectangle { - color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) + color: Theme.surfaceContainer radius: Theme.cornerRadius border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.width: 0 @@ -1000,7 +1000,7 @@ Column { } background: Rectangle { - color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) + color: Theme.surfaceContainer radius: Theme.cornerRadius border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.width: 0 @@ -1211,7 +1211,7 @@ Column { closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside background: Rectangle { - color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) + color: Theme.surfaceContainer radius: Theme.cornerRadius border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.width: 0 @@ -1319,7 +1319,7 @@ Column { closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside background: Rectangle { - color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) + color: Theme.surfaceContainer radius: Theme.cornerRadius border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.width: 0 @@ -1437,7 +1437,7 @@ Column { closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside background: Rectangle { - color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) + color: Theme.surfaceContainer radius: Theme.cornerRadius border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08) border.width: 0 diff --git a/quickshell/Modules/Settings/WindowRulesTab.qml b/quickshell/Modules/Settings/WindowRulesTab.qml index 6f48b1b2..8ac15888 100644 --- a/quickshell/Modules/Settings/WindowRulesTab.qml +++ b/quickshell/Modules/Settings/WindowRulesTab.qml @@ -220,7 +220,7 @@ Item { height: headerSection.implicitHeight + Theme.spacingL * 2 anchors.horizontalCenter: parent.horizontalCenter radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { id: headerSection @@ -376,7 +376,7 @@ Item { height: rulesSection.implicitHeight + Theme.spacingL * 2 anchors.horizontalCenter: parent.horizontalCenter radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: Theme.surfaceContainerHigh Column { id: rulesSection diff --git a/quickshell/Widgets/DankDropdown.qml b/quickshell/Widgets/DankDropdown.qml index 02488028..496d3fb6 100644 --- a/quickshell/Widgets/DankDropdown.qml +++ b/quickshell/Widgets/DankDropdown.qml @@ -12,6 +12,16 @@ Item { LayoutMirroring.enabled: I18n.isRtl LayoutMirroring.childrenInherit: true + function checkParentDisablesTransparency() { + let p = parent; + while (p) { + if (p.disablePopupTransparency === true) + return true; + p = p.parent; + } + return false; + } + property string text: "" property string description: "" property string currentValue: "" @@ -41,6 +51,7 @@ Item { property bool compactMode: text === "" && description === "" property bool addHorizontalPadding: false property string emptyText: "" + property bool usePopupTransparency: !checkParentDisablesTransparency() signal valueChanged(string value) @@ -92,7 +103,7 @@ Item { anchors.rightMargin: root.addHorizontalPadding && !root.compactMode ? Theme.spacingM : 0 anchors.verticalCenter: parent.verticalCenter radius: Theme.cornerRadius - color: dropdownArea.containsMouse || dropdownMenu.visible ? Theme.surfaceContainerHigh : Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) + color: dropdownArea.containsMouse || dropdownMenu.visible ? Theme.surfaceContainerHigh : (root.usePopupTransparency ? Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) : Theme.surfaceContainer) border.color: dropdownMenu.visible ? Theme.primary : Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.2) border.width: dropdownMenu.visible ? 2 : 1 @@ -258,7 +269,7 @@ Item { height: 42 visible: root.enableFuzzySearch radius: Theme.cornerRadius - color: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + color: root.usePopupTransparency ? Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) : Theme.surfaceContainerHigh DankTextField { id: searchField diff --git a/quickshell/Widgets/DankPopout.qml b/quickshell/Widgets/DankPopout.qml index 5d3ef8aa..9d3248bb 100644 --- a/quickshell/Widgets/DankPopout.qml +++ b/quickshell/Widgets/DankPopout.qml @@ -456,7 +456,7 @@ Item { Rectangle { anchors.fill: parent radius: Theme.cornerRadius - color: Theme.surfaceContainer + color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency) } } diff --git a/quickshell/Widgets/DankTextField.qml b/quickshell/Widgets/DankTextField.qml index 58b58c29..59b7a241 100644 --- a/quickshell/Widgets/DankTextField.qml +++ b/quickshell/Widgets/DankTextField.qml @@ -11,6 +11,16 @@ StyledRect { KeyNavigation.tab: keyNavigationTab KeyNavigation.backtab: keyNavigationBacktab + function checkParentDisablesTransparency() { + let p = parent; + while (p) { + if (p.disablePopupTransparency === true) + return true; + p = p.parent; + } + return false; + } + property alias text: textInput.text property string placeholderText: "" property alias font: textInput.font @@ -26,7 +36,8 @@ StyledRect { property bool showClearButton: false property bool showPasswordToggle: false property bool passwordVisible: false - property color backgroundColor: Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) + property bool usePopupTransparency: !checkParentDisablesTransparency() + property color backgroundColor: usePopupTransparency ? Theme.withAlpha(Theme.surfaceContainerHigh, Theme.popupTransparency) : Theme.surfaceContainerHigh property color focusedBorderColor: Theme.primary property color normalBorderColor: Theme.outlineMedium property color placeholderColor: Theme.outlineButton