mirror of
https://github.com/AvengeMedia/DankMaterialShell.git
synced 2026-10-20 02:04:01 -04:00
launcher: restore focus ring to spotlight and respect global setting
This commit is contained in:
+1
-1
Submodule dank-qml-common updated: 4b9a18dc9c...ef447dfb47
@@ -59,7 +59,6 @@ DankSearchField {
|
||||
font.pixelSize: Theme.fontSizeLarge
|
||||
backgroundColor: flat ? "transparent" : Theme.chipSurface
|
||||
normalBorderColor: flat ? "transparent" : Theme.outlineVariant
|
||||
focusedBorderColor: flat ? "transparent" : Theme.focusRingColor
|
||||
leadingContent: pluginName ? pluginBadge : null
|
||||
rightAccessoryWidth: modeViewport.visible ? modeViewport.width + Theme.spacingS : 0
|
||||
|
||||
|
||||
@@ -345,7 +345,7 @@ FocusScope {
|
||||
height: Theme.outlineWidth
|
||||
z: 1
|
||||
color: Theme.outlineVariant
|
||||
visible: root._hasQuery
|
||||
visible: root._hasQuery && !(Theme.focusRingWidth > 0 && searchInput.getActiveFocus())
|
||||
}
|
||||
|
||||
ClippingRectangle {
|
||||
|
||||
@@ -615,6 +615,7 @@ Item {
|
||||
|
||||
property bool showPassword: false
|
||||
property real errorOffset: 0
|
||||
readonly property bool focusRingShown: passwordField.activeFocus && Theme.focusRingWidth > 0
|
||||
transform: Translate {
|
||||
x: Math.max(-LockMetrics.shakeDistance, Math.min(LockMetrics.shakeDistance, passwordBox.errorOffset))
|
||||
}
|
||||
@@ -623,8 +624,8 @@ Item {
|
||||
Layout.preferredHeight: LockMetrics.fieldHeight
|
||||
radius: Theme.fullRadius(width, height)
|
||||
color: Theme.cardSurface
|
||||
border.width: passwordField.activeFocus ? Math.max(Theme.outlineWidth, Theme.focusRingWidth) : Theme.layerOutlineWidth
|
||||
border.color: passwordField.activeFocus ? Theme.focusRingColor : Theme.outlineMedium
|
||||
border.width: focusRingShown ? Math.max(Theme.outlineWidth, Theme.focusRingWidth) : Theme.layerOutlineWidth
|
||||
border.color: focusRingShown ? Theme.focusRingColor : Theme.outlineMedium
|
||||
Accessible.name: I18n.tr("Password")
|
||||
visible: SettingsData.lockScreenShowPasswordField || root.passwordBuffer.length > 0
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ DankCard {
|
||||
property real previewHeight: Math.round((width - Theme.spacingS * 2) * SettingsMetrics.choiceCardPreviewRatio)
|
||||
readonly property int infoHeight: Theme.iconButtonSize + Theme.fontSizeSmall * 4 + Theme.spacingS
|
||||
readonly property bool compatible: PluginService.checkPluginCompatibility(plugin.requires_dms)
|
||||
readonly property bool focusRingShown: selected && Theme.focusRingWidth > 0
|
||||
|
||||
signal installRequested
|
||||
signal uninstallRequested
|
||||
@@ -27,8 +28,8 @@ DankCard {
|
||||
implicitHeight: previewHeight + infoHeight + Theme.spacingS * 2 + Theme.spacingM
|
||||
radius: Theme.cornerRadiusM
|
||||
color: Theme.floatingWindowNestedSurface
|
||||
border.color: selected ? Theme.focusRingColor : Theme.outlineMedium
|
||||
border.width: selected ? Theme.focusRingWidth : Theme.layerOutlineWidth
|
||||
border.color: focusRingShown ? Theme.focusRingColor : Theme.outlineMedium
|
||||
border.width: focusRingShown ? Theme.focusRingWidth : Theme.layerOutlineWidth
|
||||
pad: 0
|
||||
clickable: true
|
||||
Accessible.name: plugin.name || ""
|
||||
|
||||
Reference in New Issue
Block a user