diff --git a/dots/.config/quickshell/ii/modules/common/widgets/FloatingActionButton.qml b/dots/.config/quickshell/ii/modules/common/widgets/FloatingActionButton.qml index 50f7300fe..1b2669210 100644 --- a/dots/.config/quickshell/ii/modules/common/widgets/FloatingActionButton.qml +++ b/dots/.config/quickshell/ii/modules/common/widgets/FloatingActionButton.qml @@ -18,7 +18,8 @@ RippleButton { colBackground: Appearance.colors.colPrimaryContainer colBackgroundHover: Appearance.colors.colPrimaryContainerHover colRipple: Appearance.colors.colPrimaryContainerActive - contentItem: RowLayout { + property color colOnBackground: Appearance.colors.colOnPrimaryContainer + contentItem: Row { id: contentRowLayout property real horizontalMargins: (root.baseSize - icon.width) / 2 anchors { @@ -30,13 +31,16 @@ RippleButton { MaterialSymbol { id: icon - Layout.fillWidth: true + anchors.verticalCenter: parent.verticalCenter horizontalAlignment: Text.AlignHCenter - iconSize: 24 - color: Appearance.colors.colOnPrimaryContainer + verticalAlignment: Text.AlignVCenter + iconSize: 26 + color: root.colOnBackground text: root.iconText } Loader { + anchors.verticalCenter: parent.verticalCenter + visible: root.buttonText?.length > 0 active: true sourceComponent: Revealer { visible: root.expanded || implicitWidth > 0 @@ -47,6 +51,7 @@ RippleButton { anchors { left: parent.left leftMargin: root.elementSpacing + verticalCenter: parent.verticalCenter } text: root.buttonText color: Appearance.colors.colOnPrimaryContainer diff --git a/dots/.config/quickshell/ii/modules/regionSelector/RegionSelection.qml b/dots/.config/quickshell/ii/modules/regionSelector/RegionSelection.qml index 33d1f59df..39c45d965 100644 --- a/dots/.config/quickshell/ii/modules/regionSelector/RegionSelection.qml +++ b/dots/.config/quickshell/ii/modules/regionSelector/RegionSelection.qml @@ -469,6 +469,7 @@ PanelWindow { colBackground: Appearance.colors.colTertiaryContainer colBackgroundHover: Appearance.colors.colTertiaryContainerHover colRipple: Appearance.colors.colTertiaryContainerActive + colOnBackground: Appearance.colors.colOnTertiaryContainer } } } diff --git a/dots/.config/quickshell/ii/modules/sidebarRight/todo/TodoWidget.qml b/dots/.config/quickshell/ii/modules/sidebarRight/todo/TodoWidget.qml index 976f5b2b1..99b0100f5 100644 --- a/dots/.config/quickshell/ii/modules/sidebarRight/todo/TodoWidget.qml +++ b/dots/.config/quickshell/ii/modules/sidebarRight/todo/TodoWidget.qml @@ -163,13 +163,7 @@ Item { anchors.bottomMargin: root.fabMargins onClicked: root.showAddDialog = true - - contentItem: MaterialSymbol { - text: "add" - horizontalAlignment: Text.AlignHCenter - iconSize: Appearance.font.pixelSize.huge - color: Appearance.m3colors.m3onPrimaryContainer - } + iconText: "add" } Item {