amass/FluentUI
1
0
Fork 0
mirror of https://github.com/zhuzichu520/FluentUI.git synced 2025-01-23 04:14:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
朱子楚\zhuzi 2023-12-04 21:52:57 +08:00
parent 46148b3c5c
commit bc0c36772f
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/Qt5/imports/FluentUI/Controls/FluShortcutPicker.qml
View File

@ -189,24 +189,25 @@ FluIconButton {
forceActiveFocus() forceActiveFocus()
} }
Keys.enabled: true Keys.enabled: true
Keys.onPressed: { Keys.onPressed:
var keyNames = [] (event)=>{
if (event.modifiers & Qt.AltModifier) { var keyNames = []
keyNames.push("Alt") if (event.modifiers & Qt.AltModifier) {
keyNames.push("Alt")
}
if (event.modifiers & Qt.ControlModifier) {
keyNames.push("Ctrl")
}
if (event.modifiers & Qt.ShiftModifier) {
keyNames.push("Shift")
}
var keyName = d.keyToString(event.key,false)
if(keyName!==""){
keyNames.push(keyName)
content_dialog.keysModel = keyNames
}
event.accepted = true
} }
if (event.modifiers & Qt.ControlModifier) {
keyNames.push("Ctrl")
}
if (event.modifiers & Qt.ShiftModifier) {
keyNames.push("Shift")
}
var keyName = d.keyToString(event.key,false)
if(keyName!==""){
keyNames.push(keyName)
content_dialog.keysModel = keyNames
}
event.accepted = true
}
Keys.onTabPressed: Keys.onTabPressed:
(event)=>{ (event)=>{
event.accepted = true event.accepted = true

35
src/Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml
View File

@ -189,24 +189,25 @@ FluIconButton {
forceActiveFocus() forceActiveFocus()
} }
Keys.enabled: true Keys.enabled: true
Keys.onPressed: { Keys.onPressed:
var keyNames = [] (event)=>{
if (event.modifiers & Qt.AltModifier) { var keyNames = []
keyNames.push("Alt") if (event.modifiers & Qt.AltModifier) {
keyNames.push("Alt")
}
if (event.modifiers & Qt.ControlModifier) {
keyNames.push("Ctrl")
}
if (event.modifiers & Qt.ShiftModifier) {
keyNames.push("Shift")
}
var keyName = d.keyToString(event.key,false)
if(keyName!==""){
keyNames.push(keyName)
content_dialog.keysModel = keyNames
}
event.accepted = true
} }
if (event.modifiers & Qt.ControlModifier) {
keyNames.push("Ctrl")
}
if (event.modifiers & Qt.ShiftModifier) {
keyNames.push("Shift")
}
var keyName = d.keyToString(event.key,false)
if(keyName!==""){
keyNames.push(keyName)
content_dialog.keysModel = keyNames
}
event.accepted = true
}
Keys.onTabPressed: Keys.onTabPressed:
(event)=>{ (event)=>{
event.accepted = true event.accepted = true