mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-01-24 21:42:51 -05:00
Merge branch 'master' of github.com:bbedward/dank-material-dark-shell
This commit is contained in:
@@ -633,7 +633,11 @@ PanelWindow {
|
||||
BluetoothTab {
|
||||
anchors.fill: parent
|
||||
anchors.margins: Theme.spacingM
|
||||
<<<<<<< HEAD
|
||||
visible: root.bluetoothAvailable && controlCenterPopup.currentTab === 2
|
||||
=======
|
||||
visible: controlCenterPopup.currentTab === "bluetooth"
|
||||
>>>>>>> 86d4c7a429ff69eb5d4da204f98f045ed4634ad3
|
||||
|
||||
// Bind properties from root
|
||||
bluetoothEnabled: root.bluetoothEnabled
|
||||
@@ -644,7 +648,11 @@ PanelWindow {
|
||||
DisplayTab {
|
||||
anchors.fill: parent
|
||||
anchors.margins: Theme.spacingM
|
||||
<<<<<<< HEAD
|
||||
visible: controlCenterPopup.currentTab === (root.bluetoothAvailable ? 3 : 2)
|
||||
=======
|
||||
visible: controlCenterPopup.currentTab === "display"
|
||||
>>>>>>> 86d4c7a429ff69eb5d4da204f98f045ed4634ad3
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,68 +162,6 @@ ScrollView {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Top Bar Transparency Control
|
||||
Column {
|
||||
width: parent.width
|
||||
spacing: Theme.spacingM
|
||||
anchors.margins: Theme.spacingM
|
||||
|
||||
Text {
|
||||
text: "Top Bar Transparency"
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
color: Theme.surfaceText
|
||||
font.weight: Font.Medium
|
||||
}
|
||||
|
||||
CustomSlider {
|
||||
width: parent.width - (Theme.spacingM * 2)
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
value: Math.round(Prefs.topBarTransparency * 100)
|
||||
minimum: 0
|
||||
maximum: 100
|
||||
leftIcon: "opacity"
|
||||
rightIcon: "circle"
|
||||
unit: "%"
|
||||
showValue: true
|
||||
|
||||
onSliderValueChanged: (newValue) => {
|
||||
let transparencyValue = newValue / 100.0
|
||||
// Update live preview
|
||||
}
|
||||
|
||||
onSliderDragFinished: (finalValue) => {
|
||||
let transparencyValue = finalValue / 100.0
|
||||
Prefs.setTopBarTransparency(transparencyValue)
|
||||
}
|
||||
}
|
||||
|
||||
Text {
|
||||
text: "Adjust the transparency of the top bar background"
|
||||
font.pixelSize: Theme.fontSizeSmall
|
||||
color: Theme.surfaceVariantText
|
||||
wrapMode: Text.WordWrap
|
||||
width: parent.width - (Theme.spacingM * 2)
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
}
|
||||
|
||||
// Theme Picker
|
||||
Column {
|
||||
width: parent.width
|
||||
spacing: Theme.spacingS
|
||||
|
||||
Text {
|
||||
text: "Theme Color"
|
||||
font.pixelSize: Theme.fontSizeMedium
|
||||
color: Theme.surfaceText
|
||||
font.weight: Font.Medium
|
||||
}
|
||||
|
||||
ThemePicker {
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -98,7 +98,7 @@ PanelWindow {
|
||||
}
|
||||
|
||||
Item {
|
||||
width: parent.width - 200 // Spacer to push close button to the right
|
||||
width: parent.width - 175 // Spacer to push close button to the right
|
||||
height: 1
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user