Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 21:42:51 -05:00
Code Packages Releases Activity

settings: fix scrollable area in window

Browse Source
This commit is contained in:
bbedward
2025-11-24 11:56:10 -05:00
parent 7fa87125b5
commit b078e23aa1
17 changed files with 882 additions and 978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quickshell/Modals/Settings/PowerSettings.qml
View File

@@ -10,12 +10,13 @@ Item {
anchors.fill: parent
anchors.topMargin: Theme.spacingL
clip: true
contentHeight: mainColumn.height
contentHeight: mainColumn.height + Theme.spacingXL
contentWidth: width
Column {
id: mainColumn
width: parent.width
width: Math.min(550, parent.width - Theme.spacingL * 2)
anchors.horizontalCenter: parent.horizontalCenter
spacing: Theme.spacingXL
StyledRect {

9
quickshell/Modals/Settings/ProfileSection.qml
View File

@@ -1,5 +1,4 @@
import QtQuick
import QtQuick.Effects
import qs.Common
import qs.Services
import qs.Widgets
@@ -81,7 +80,6 @@ Rectangle {
}
}
}
}
Rectangle {
@@ -105,11 +103,8 @@ Rectangle {
return PortalService.setProfileImage("");
}
}
}
}
}
MouseArea {
@@ -121,7 +116,6 @@ Rectangle {
propagateComposedEvents: true
acceptedButtons: Qt.NoButton
}
}
Column {
@@ -145,9 +139,6 @@ Rectangle {
elide: Text.ElideRight
width: parent.width
}
}
}
}

63
quickshell/Modals/Settings/SettingsContent.qml
View File

@@ -13,7 +13,7 @@ FocusScope {
Rectangle {
anchors.fill: parent
anchors.leftMargin: Theme.spacingS
anchors.rightMargin: 0
anchors.rightMargin: (parentModal && parentModal.isCompactMode) ? Theme.spacingS : (32 + Theme.spacingS)
anchors.bottomMargin: 0
anchors.topMargin: 0
color: "transparent"
@@ -30,15 +30,13 @@ FocusScope {
PersonalizationTab {
parentModal: root.parentModal
}
}
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -49,15 +47,13 @@ FocusScope {
visible: active
focus: active
sourceComponent: TimeWeatherTab {
}
sourceComponent: TimeWeatherTab {}
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -74,10 +70,9 @@ FocusScope {
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -88,15 +83,13 @@ FocusScope {
visible: active
focus: active
sourceComponent: WidgetTweaksTab {
}
sourceComponent: WidgetTweaksTab {}
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -108,17 +101,14 @@ FocusScope {
focus: active
sourceComponent: Component {
DockTab {
}
DockTab {}
}
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -129,15 +119,13 @@ FocusScope {
visible: active
focus: active
sourceComponent: DisplaysTab {
}
sourceComponent: DisplaysTab {}
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -148,15 +136,13 @@ FocusScope {
visible: active
focus: active
sourceComponent: LauncherTab {
}
sourceComponent: LauncherTab {}
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -167,15 +153,13 @@ FocusScope {
visible: active
focus: active
sourceComponent: ThemeColorsTab {
}
sourceComponent: ThemeColorsTab {}
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -186,15 +170,13 @@ FocusScope {
visible: active
focus: active
sourceComponent: PowerSettings {
}
sourceComponent: PowerSettings {}
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -211,10 +193,9 @@ FocusScope {
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
Loader {
@@ -225,17 +206,13 @@ FocusScope {
visible: active
focus: active
sourceComponent: AboutTab {
}
sourceComponent: AboutTab {}
onActiveChanged: {
if (active && item) {
Qt.callLater(() => item.forceActiveFocus())
Qt.callLater(() => item.forceActiveFocus());
}
}
}
}
}

4
quickshell/Modals/Settings/SettingsModal.qml
View File

@@ -234,9 +234,7 @@ FloatingWindow {
SettingsContent {
id: content
width: Math.min(550, parent.width - Theme.spacingL * 2)
height: parent.height
anchors.horizontalCenter: parent.horizontalCenter
anchors.fill: parent
parentModal: settingsModal
currentIndex: settingsModal.currentTabIndex
}