mirror of
https://github.com/noctalia-dev/noctalia-shell.git
synced 2026-05-11 17:08:27 +08:00
Merge pull request #2122 from notiant/patch-21
Fix transparency issues with connected box for Bluetooth/WiFi
This commit is contained in:
@@ -82,7 +82,7 @@ NBox {
|
||||
|
||||
opacity: (NetworkService.disconnectingFrom === modelData.ssid || NetworkService.forgettingNetwork === modelData.ssid) ? 0.6 : 1.0
|
||||
|
||||
color: modelData.connected ? Qt.alpha(Color.mPrimary, 0.15) : Color.mSurface
|
||||
color: modelData.connected ? Qt.alpha(Color.mPrimary, Math.min(1.15 - Settings.data.ui.panelBackgroundOpacity, 0.75)) : Color.mSurface
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation {
|
||||
|
||||
@@ -198,6 +198,7 @@ Item {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: connectedDevicesCol.implicitHeight + Style.margin2M
|
||||
border.color: showOnlyLists ? Style.boxBorderColor : "transparent"
|
||||
color: showOnlyLists ? Color.mSurfaceVariant : "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
id: connectedDevicesCol
|
||||
@@ -228,6 +229,7 @@ Item {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: pairedDevicesCol.implicitHeight + Style.margin2M
|
||||
border.color: showOnlyLists ? Style.boxBorderColor : "transparent"
|
||||
color: showOnlyLists ? Color.mSurfaceVariant : "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
id: pairedDevicesCol
|
||||
@@ -258,6 +260,7 @@ Item {
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: availableDevicesCol.implicitHeight + Style.margin2M
|
||||
border.color: "transparent"
|
||||
color: showOnlyLists ? Color.mSurfaceVariant : "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
id: availableDevicesCol
|
||||
@@ -386,7 +389,7 @@ Item {
|
||||
radius: Style.radiusM
|
||||
clip: true
|
||||
|
||||
color: (modelData.connected && modelData.state !== BluetoothDeviceState.Disconnecting) ? Qt.alpha(Color.mPrimary, 0.15) : Color.mSurface
|
||||
color: (modelData.connected && modelData.state !== BluetoothDeviceState.Disconnecting) ? Qt.alpha(Color.mPrimary, Math.min(1.15 - Settings.data.ui.panelBackgroundOpacity, 0.75)) : Color.mSurface
|
||||
|
||||
ColumnLayout {
|
||||
id: deviceColumn
|
||||
|
||||
Reference in New Issue
Block a user