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

binds: fix to scale with arbitrary font sizes

Browse Source
This commit is contained in:
bbedward
2025-12-14 10:56:03 -05:00
parent 24fe215067
commit 5e2a418485
3 changed files with 108 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
quickshell/Modules/Settings/KeybindsTab.qml
View File

@@ -229,7 +229,7 @@ Item {
DankTextField { DankTextField {
id: searchField id: searchField
width: parent.width - addButton.width - Theme.spacingM width: parent.width - addButton.width - Theme.spacingM
height: 44 height: Math.round(Theme.fontSizeMedium * 3)
placeholderText: I18n.tr("Search keybinds...") placeholderText: I18n.tr("Search keybinds...")
leftIconName: "search" leftIconName: "search"
onTextChanged: { onTextChanged: {
@@ -240,8 +240,8 @@ Item {
DankActionButton { DankActionButton {
id: addButton id: addButton
width: 44 width: searchField.height
height: 44 height: searchField.height
circular: false circular: false
iconName: "add" iconName: "add"
iconSize: Theme.iconSize iconSize: Theme.iconSize
@@ -331,7 +331,7 @@ Item {
Rectangle { Rectangle {
id: fixButton id: fixButton
width: fixButtonText.implicitWidth + Theme.spacingL * 2 width: fixButtonText.implicitWidth + Theme.spacingL * 2
height: 36 height: Math.round(Theme.fontSizeMedium * 2.5)
radius: Theme.cornerRadius radius: Theme.cornerRadius
visible: warningBox.showError || warningBox.showSetup visible: warningBox.showError || warningBox.showSetup
color: KeybindsService.fixing ? Theme.withAlpha(Theme.error, 0.6) : Theme.error color: KeybindsService.fixing ? Theme.withAlpha(Theme.error, 0.6) : Theme.error
@@ -382,9 +382,10 @@ Item {
spacing: Theme.spacingS spacing: Theme.spacingS
Rectangle { Rectangle {
readonly property real chipHeight: allChip.implicitHeight + Theme.spacingM
width: allChip.implicitWidth + Theme.spacingL width: allChip.implicitWidth + Theme.spacingL
height: 32 height: chipHeight
radius: 16 radius: chipHeight / 2
color: !keybindsTab.selectedCategory ? Theme.primary : Theme.surfaceContainerHighest color: !keybindsTab.selectedCategory ? Theme.primary : Theme.surfaceContainerHighest
StyledText { StyledText {
@@ -412,9 +413,10 @@ Item {
required property string modelData required property string modelData
required property int index required property int index
readonly property real chipHeight: catText.implicitHeight + Theme.spacingM
width: catText.implicitWidth + Theme.spacingL width: catText.implicitWidth + Theme.spacingL
height: 32 height: chipHeight
radius: 16 radius: chipHeight / 2
color: keybindsTab.selectedCategory === modelData ? Theme.primary : (modelData === "__overrides__" ? Theme.withAlpha(Theme.primary, 0.15) : Theme.surfaceContainerHighest) color: keybindsTab.selectedCategory === modelData ? Theme.primary : (modelData === "__overrides__" ? Theme.withAlpha(Theme.primary, 0.15) : Theme.surfaceContainerHighest)
StyledText { StyledText {

63
quickshell/Widgets/DankTextField.qml
View File

@@ -1,5 +1,4 @@
import QtQuick import QtQuick
import QtQuick.Controls
import qs.Common import qs.Common
import qs.Widgets import qs.Widgets
@@ -13,7 +12,7 @@ StyledRect {
onActiveFocusChanged: { onActiveFocusChanged: {
if (activeFocus) { if (activeFocus) {
textInput.forceActiveFocus() textInput.forceActiveFocus();
} }
} }
@@ -53,26 +52,26 @@ StyledRect {
signal focusStateChanged(bool hasFocus) signal focusStateChanged(bool hasFocus)
function getActiveFocus() { function getActiveFocus() {
return textInput.activeFocus return textInput.activeFocus;
} }
function setFocus(value) { function setFocus(value) {
textInput.focus = value textInput.focus = value;
} }
function forceActiveFocus() { function forceActiveFocus() {
textInput.forceActiveFocus() textInput.forceActiveFocus();
} }
function selectAll() { function selectAll() {
textInput.selectAll() textInput.selectAll();
} }
function clear() { function clear() {
textInput.clear() textInput.clear();
} }
function insertText(str) { function insertText(str) {
textInput.insert(textInput.cursorPosition, str) textInput.insert(textInput.cursorPosition, str);
} }
width: 200 width: 200
height: 48 height: Math.round(Theme.fontSizeMedium * 3.4)
radius: cornerRadius radius: cornerRadius
color: backgroundColor color: backgroundColor
border.color: textInput.activeFocus ? focusedBorderColor : normalBorderColor border.color: textInput.activeFocus ? focusedBorderColor : normalBorderColor
@@ -112,30 +111,30 @@ StyledRect {
onActiveFocusChanged: root.focusStateChanged(activeFocus) onActiveFocusChanged: root.focusStateChanged(activeFocus)
Keys.forwardTo: root.keyForwardTargets Keys.forwardTo: root.keyForwardTargets
Keys.onLeftPressed: event => { Keys.onLeftPressed: event => {
if (root.ignoreLeftRightKeys) { if (root.ignoreLeftRightKeys) {
event.accepted = true event.accepted = true;
} else { } else {
// Allow normal TextInput cursor movement // Allow normal TextInput cursor movement
event.accepted = false event.accepted = false;
} }
} }
Keys.onRightPressed: event => { Keys.onRightPressed: event => {
if (root.ignoreLeftRightKeys) { if (root.ignoreLeftRightKeys) {
event.accepted = true event.accepted = true;
} else { } else {
event.accepted = false event.accepted = false;
} }
} }
Keys.onPressed: event => { Keys.onPressed: event => {
if (root.ignoreTabKeys && (event.key === Qt.Key_Tab || event.key === Qt.Key_Backtab)) { if (root.ignoreTabKeys && (event.key === Qt.Key_Tab || event.key === Qt.Key_Backtab)) {
event.accepted = false event.accepted = false;
for (var i = 0; i < root.keyForwardTargets.length; i++) { for (var i = 0; i < root.keyForwardTargets.length; i++) {
if (root.keyForwardTargets[i]) { if (root.keyForwardTargets[i]) {
root.keyForwardTargets[i].Keys.pressed(event) root.keyForwardTargets[i].Keys.pressed(event);
} }
} }
} }
} }
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@@ -171,7 +170,7 @@ StyledRect {
hoverEnabled: true hoverEnabled: true
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: { onClicked: {
textInput.text = "" textInput.text = "";
} }
} }
} }

128
quickshell/Widgets/KeybindItem.qml
View File

@@ -54,6 +54,12 @@ Item {
readonly property var _conflicts: editKey ? KeyUtils.getConflictingBinds(editKey, bindData.action, KeybindsService.getFlatBinds()) : [] readonly property var _conflicts: editKey ? KeyUtils.getConflictingBinds(editKey, bindData.action, KeybindsService.getFlatBinds()) : []
readonly property bool hasConflict: _conflicts.length > 0 readonly property bool hasConflict: _conflicts.length > 0
readonly property real _inputHeight: Math.round(Theme.fontSizeMedium * 3)
readonly property real _chipHeight: Math.round(Theme.fontSizeSmall * 2.3)
readonly property real _buttonHeight: Math.round(Theme.fontSizeMedium * 2.3)
readonly property real _keysColumnWidth: Math.round(Theme.fontSizeSmall * 12)
readonly property real _labelWidth: Math.round(Theme.fontSizeSmall * 5)
signal toggleExpand signal toggleExpand
signal saveBind(string originalKey, var newData) signal saveBind(string originalKey, var newData)
signal removeBind(string key) signal removeBind(string key)
@@ -223,7 +229,7 @@ Item {
Rectangle { Rectangle {
id: collapsedRect id: collapsedRect
width: parent.width width: parent.width
height: Math.max(52, keysColumn.implicitHeight + Theme.spacingM * 2) height: Math.max(root._inputHeight + Theme.spacingM, keysColumn.implicitHeight + Theme.spacingM * 2)
radius: root.isExpanded ? 0 : Theme.cornerRadius radius: root.isExpanded ? 0 : Theme.cornerRadius
topLeftRadius: Theme.cornerRadius topLeftRadius: Theme.cornerRadius
topRightRadius: Theme.cornerRadius topRightRadius: Theme.cornerRadius
@@ -240,7 +246,7 @@ Item {
Column { Column {
id: keysColumn id: keysColumn
Layout.preferredWidth: 140 Layout.preferredWidth: root._keysColumnWidth
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
spacing: Theme.spacingXS spacing: Theme.spacingXS
@@ -253,9 +259,9 @@ Item {
property bool isSelected: root.isExpanded && root.editingKeyIndex === index && !root.addingNewKey property bool isSelected: root.isExpanded && root.editingKeyIndex === index && !root.addingNewKey
width: 140 width: root._keysColumnWidth
height: 28 height: root._chipHeight
radius: 6 radius: root._chipHeight / 4
color: isSelected ? Theme.primary : Theme.surfaceVariant color: isSelected ? Theme.primary : Theme.surfaceVariant
Rectangle { Rectangle {
@@ -332,7 +338,7 @@ Item {
DankIcon { DankIcon {
name: "warning" name: "warning"
size: 14 size: Theme.iconSizeSmall
color: Theme.primary color: Theme.primary
visible: root.hasConfigConflict visible: root.hasConfigConflict
} }
@@ -352,7 +358,7 @@ Item {
DankIcon { DankIcon {
name: root.isExpanded ? "expand_less" : "expand_more" name: root.isExpanded ? "expand_less" : "expand_more"
size: 20 size: Theme.iconSize - 4
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
} }
@@ -360,7 +366,7 @@ Item {
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 140 + Theme.spacingM * 2 anchors.leftMargin: root._keysColumnWidth + Theme.spacingM * 2
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
onClicked: root.toggleExpand() onClicked: root.toggleExpand()
} }
@@ -420,7 +426,7 @@ Item {
DankIcon { DankIcon {
name: "warning" name: "warning"
size: 16 size: Theme.iconSizeSmall
color: Theme.primary color: Theme.primary
} }
@@ -461,7 +467,7 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
Flow { Flow {
@@ -478,8 +484,8 @@ Item {
property bool isSelected: root.editingKeyIndex === index && !root.addingNewKey property bool isSelected: root.editingKeyIndex === index && !root.addingNewKey
width: editKeyChipText.implicitWidth + Theme.spacingM width: editKeyChipText.implicitWidth + Theme.spacingM
height: 28 height: root._chipHeight
radius: 6 radius: root._chipHeight / 4
color: isSelected ? Theme.primary : Theme.surfaceVariant color: isSelected ? Theme.primary : Theme.surfaceVariant
Rectangle { Rectangle {
@@ -509,9 +515,9 @@ Item {
} }
Rectangle { Rectangle {
width: 28 width: root._chipHeight
height: 28 height: root._chipHeight
radius: 6 radius: root._chipHeight / 4
color: root.addingNewKey ? Theme.primary : Theme.surfaceVariant color: root.addingNewKey ? Theme.primary : Theme.surfaceVariant
visible: !root.isNew visible: !root.isNew
@@ -523,7 +529,7 @@ Item {
DankIcon { DankIcon {
name: "add" name: "add"
size: 16 size: Theme.iconSizeSmall
color: root.addingNewKey ? Theme.primaryText : Theme.surfaceVariantText color: root.addingNewKey ? Theme.primaryText : Theme.surfaceVariantText
anchors.centerIn: parent anchors.centerIn: parent
} }
@@ -548,13 +554,13 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
FocusScope { FocusScope {
id: captureScope id: captureScope
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
focus: root.recording focus: root.recording
Component.onCompleted: { Component.onCompleted: {
@@ -596,12 +602,12 @@ Item {
DankActionButton { DankActionButton {
id: recordBtn id: recordBtn
width: 28 width: root._chipHeight
height: 28 height: root._chipHeight
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
circular: false circular: false
iconName: root.recording ? "close" : "radio_button_checked" iconName: root.recording ? "close" : "radio_button_checked"
iconSize: 16 iconSize: Theme.iconSizeSmall
iconColor: root.recording ? Theme.error : Theme.primary iconColor: root.recording ? Theme.error : Theme.primary
onClicked: root.recording ? root.stopRecording() : root.startRecording() onClicked: root.recording ? root.stopRecording() : root.startRecording()
} }
@@ -703,8 +709,8 @@ Item {
} }
Rectangle { Rectangle {
Layout.preferredWidth: 40 Layout.preferredWidth: root._inputHeight
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: root.addingNewKey ? Theme.primary : Theme.surfaceVariant color: root.addingNewKey ? Theme.primary : Theme.surfaceVariant
visible: root.keys.length === 1 && !root.isNew visible: root.keys.length === 1 && !root.isNew
@@ -717,7 +723,7 @@ Item {
DankIcon { DankIcon {
name: "add" name: "add"
size: 18 size: Theme.iconSizeSmall + 2
color: root.addingNewKey ? Theme.primaryText : Theme.surfaceVariantText color: root.addingNewKey ? Theme.primaryText : Theme.surfaceVariantText
anchors.centerIn: parent anchors.centerIn: parent
} }
@@ -736,11 +742,11 @@ Item {
Layout.fillWidth: true Layout.fillWidth: true
spacing: Theme.spacingS spacing: Theme.spacingS
visible: root.hasConflict visible: root.hasConflict
Layout.leftMargin: 60 + Theme.spacingM Layout.leftMargin: root._labelWidth + Theme.spacingM
DankIcon { DankIcon {
name: "warning" name: "warning"
size: 16 size: Theme.iconSizeSmall
color: Theme.primary color: Theme.primary
} }
@@ -762,7 +768,7 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
RowLayout { RowLayout {
@@ -785,7 +791,7 @@ Item {
}) })
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 36 Layout.preferredHeight: root._buttonHeight
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: root._actionType === modelData.id ? Theme.surfaceContainerHighest : Theme.surfaceContainer color: root._actionType === modelData.id ? Theme.surfaceContainerHighest : Theme.surfaceContainer
border.color: root._actionType === modelData.id ? Theme.outline : (typeArea.containsMouse ? Theme.outlineVariant : "transparent") border.color: root._actionType === modelData.id ? Theme.outline : (typeArea.containsMouse ? Theme.outlineVariant : "transparent")
@@ -797,7 +803,7 @@ Item {
DankIcon { DankIcon {
name: typeDelegate.modelData.icon name: typeDelegate.modelData.icon
size: 16 size: Theme.iconSizeSmall
color: root._actionType === typeDelegate.modelData.id ? Theme.surfaceText : Theme.surfaceVariantText color: root._actionType === typeDelegate.modelData.id ? Theme.surfaceText : Theme.surfaceVariantText
} }
@@ -869,7 +875,7 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
DankDropdown { DankDropdown {
@@ -913,14 +919,14 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
visible: dmsArgsRow.hasAmountArg visible: dmsArgsRow.hasAmountArg
} }
DankTextField { DankTextField {
id: dmsAmountField id: dmsAmountField
Layout.preferredWidth: 80 Layout.preferredWidth: Math.round(Theme.fontSizeMedium * 5.5)
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
placeholderText: "5" placeholderText: "5"
visible: dmsArgsRow.hasAmountArg visible: dmsArgsRow.hasAmountArg
@@ -961,14 +967,14 @@ Item {
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.leftMargin: dmsArgsRow.hasAmountArg ? Theme.spacingM : 0 Layout.leftMargin: dmsArgsRow.hasAmountArg ? Theme.spacingM : 0
Layout.preferredWidth: dmsArgsRow.hasAmountArg ? -1 : 60 Layout.preferredWidth: dmsArgsRow.hasAmountArg ? -1 : root._labelWidth
visible: dmsArgsRow.hasDeviceArg visible: dmsArgsRow.hasDeviceArg
} }
DankTextField { DankTextField {
id: dmsDeviceField id: dmsDeviceField
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
placeholderText: I18n.tr("leave empty for default") placeholderText: I18n.tr("leave empty for default")
visible: dmsArgsRow.hasDeviceArg visible: dmsArgsRow.hasDeviceArg
@@ -1006,7 +1012,7 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
visible: dmsArgsRow.hasTabArg visible: dmsArgsRow.hasTabArg
} }
@@ -1064,12 +1070,12 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
DankDropdown { DankDropdown {
id: compositorCatDropdown id: compositorCatDropdown
Layout.preferredWidth: 120 Layout.preferredWidth: Math.round(Theme.fontSizeMedium * 8.5)
compactMode: true compactMode: true
currentValue: { currentValue: {
const base = root.editAction.split(" ")[0]; const base = root.editAction.split(" ")[0];
@@ -1108,8 +1114,8 @@ Item {
} }
Rectangle { Rectangle {
Layout.preferredWidth: 40 Layout.preferredWidth: root._inputHeight
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceVariant color: Theme.surfaceVariant
@@ -1121,7 +1127,7 @@ Item {
DankIcon { DankIcon {
name: "edit" name: "edit"
size: 18 size: Theme.iconSizeSmall + 2
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
anchors.centerIn: parent anchors.centerIn: parent
} }
@@ -1150,7 +1156,7 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
RowLayout { RowLayout {
@@ -1160,7 +1166,7 @@ Item {
DankTextField { DankTextField {
id: argValueField id: argValueField
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
visible: { visible: {
const cfg = optionsRow.argConfig; const cfg = optionsRow.argConfig;
if (!cfg?.config?.args) if (!cfg?.config?.args)
@@ -1308,13 +1314,13 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
DankTextField { DankTextField {
id: customCompositorField id: customCompositorField
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
placeholderText: I18n.tr("e.g., focus-workspace 3, resize-column -10") placeholderText: I18n.tr("e.g., focus-workspace 3, resize-column -10")
text: root._actionType === "compositor" ? root.editAction : "" text: root._actionType === "compositor" ? root.editAction : ""
onTextChanged: { onTextChanged: {
@@ -1327,8 +1333,8 @@ Item {
} }
Rectangle { Rectangle {
Layout.preferredWidth: 40 Layout.preferredWidth: root._inputHeight
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
radius: Theme.cornerRadius radius: Theme.cornerRadius
color: Theme.surfaceVariant color: Theme.surfaceVariant
@@ -1340,7 +1346,7 @@ Item {
DankIcon { DankIcon {
name: "list" name: "list"
size: 18 size: Theme.iconSizeSmall + 2
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
anchors.centerIn: parent anchors.centerIn: parent
} }
@@ -1371,13 +1377,13 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
DankTextField { DankTextField {
id: spawnTextField id: spawnTextField
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
placeholderText: I18n.tr("e.g., firefox, kitty --title foo") placeholderText: I18n.tr("e.g., firefox, kitty --title foo")
readonly property var _parsed: root._actionType === "spawn" ? Actions.parseSpawnCommand(root.editAction) : null readonly property var _parsed: root._actionType === "spawn" ? Actions.parseSpawnCommand(root.editAction) : null
text: _parsed ? (_parsed.command + " " + _parsed.args.join(" ")).trim() : "" text: _parsed ? (_parsed.command + " " + _parsed.args.join(" ")).trim() : ""
@@ -1403,13 +1409,13 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
DankTextField { DankTextField {
id: shellTextField id: shellTextField
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
placeholderText: I18n.tr("e.g., notify-send 'Hello' && sleep 1") placeholderText: I18n.tr("e.g., notify-send 'Hello' && sleep 1")
text: root._actionType === "shell" ? Actions.parseShellCommand(root.editAction) : "" text: root._actionType === "shell" ? Actions.parseShellCommand(root.editAction) : ""
onTextChanged: { onTextChanged: {
@@ -1431,13 +1437,13 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
DankTextField { DankTextField {
id: titleField id: titleField
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
placeholderText: I18n.tr("Hotkey overlay title (optional)") placeholderText: I18n.tr("Hotkey overlay title (optional)")
text: root.editDesc text: root.editDesc
onTextChanged: root.updateEdit({ onTextChanged: root.updateEdit({
@@ -1455,13 +1461,13 @@ Item {
font.pixelSize: Theme.fontSizeSmall font.pixelSize: Theme.fontSizeSmall
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.surfaceVariantText color: Theme.surfaceVariantText
Layout.preferredWidth: 60 Layout.preferredWidth: root._labelWidth
} }
DankTextField { DankTextField {
id: cooldownField id: cooldownField
Layout.preferredWidth: 100 Layout.preferredWidth: Math.round(Theme.fontSizeMedium * 7)
Layout.preferredHeight: 40 Layout.preferredHeight: root._inputHeight
placeholderText: "0" placeholderText: "0"
Connections { Connections {
@@ -1508,8 +1514,8 @@ Item {
spacing: Theme.spacingM spacing: Theme.spacingM
DankActionButton { DankActionButton {
Layout.preferredWidth: 32 Layout.preferredWidth: root._buttonHeight
Layout.preferredHeight: 32 Layout.preferredHeight: root._buttonHeight
circular: false circular: false
iconName: "delete" iconName: "delete"
iconSize: Theme.iconSize - 4 iconSize: Theme.iconSize - 4
@@ -1531,7 +1537,7 @@ Item {
DankButton { DankButton {
text: I18n.tr("Cancel") text: I18n.tr("Cancel")
buttonHeight: 32 buttonHeight: root._buttonHeight
backgroundColor: Theme.surfaceContainer backgroundColor: Theme.surfaceContainer
textColor: Theme.surfaceText textColor: Theme.surfaceText
visible: root.hasChanges || root.isNew visible: root.hasChanges || root.isNew
@@ -1547,7 +1553,7 @@ Item {
DankButton { DankButton {
text: root.isNew ? I18n.tr("Add") : I18n.tr("Save") text: root.isNew ? I18n.tr("Add") : I18n.tr("Save")
buttonHeight: 32 buttonHeight: root._buttonHeight
enabled: root.canSave() enabled: root.canSave()
visible: root.hasChanges || root.isNew visible: root.hasChanges || root.isNew
onClicked: root.doSave() onClicked: root.doSave()