Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2025-12-08 22:45:38 -05:00
Code Packages Releases Activity

Conflict fixes

Browse Source
This commit is contained in:
bbedward
2025-07-12 21:50:42 -04:00
parent c2a12bb950
commit 2e94cf26a7
1 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Widgets/ControlCenter/ControlCenterPopup.qml
View File

@@ -633,11 +633,7 @@ PanelWindow {
BluetoothTab { BluetoothTab {
anchors.fill: parent anchors.fill: parent
anchors.margins: Theme.spacingM anchors.margins: Theme.spacingM
<<<<<<< HEAD visible: root.bluetoothAvailable && controlCenterPopup.currentTab === "bluetooth"
visible: root.bluetoothAvailable && controlCenterPopup.currentTab === 2
=======
visible: controlCenterPopup.currentTab === "bluetooth"
>>>>>>> 86d4c7a429ff69eb5d4da204f98f045ed4634ad3
// Bind properties from root // Bind properties from root
bluetoothEnabled: root.bluetoothEnabled bluetoothEnabled: root.bluetoothEnabled
@@ -648,11 +644,7 @@ PanelWindow {
DisplayTab { DisplayTab {
anchors.fill: parent anchors.fill: parent
anchors.margins: Theme.spacingM anchors.margins: Theme.spacingM
<<<<<<< HEAD
visible: controlCenterPopup.currentTab === (root.bluetoothAvailable ? 3 : 2)
=======
visible: controlCenterPopup.currentTab === "display" visible: controlCenterPopup.currentTab === "display"
>>>>>>> 86d4c7a429ff69eb5d4da204f98f045ed4634ad3
} }
} }