alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ToolButton: Improve keyboard navigation support

Browse Source 
Use the hover frame to indicate focus, do not give focus if keyboard
navigation is not defined.

REVIEW: 104727
This commit is contained in:
Aurélien Gâteau 2012-04-25 12:36:00 +02:00
parent 47d42a6d36
commit 90bddbf61e
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
declarativeimports/plasmacomponents/qml/ToolButton.qml
View File

@ -80,11 +80,6 @@ Item {
enabled: defaultAction==undefined||defaultAction.enabled enabled: defaultAction==undefined||defaultAction.enabled
onFlatChanged: {
surface.opacity = 1
}
implicitWidth: { implicitWidth: {
if (label.paintedWidth == 0) { if (label.paintedWidth == 0) {
return implicitHeight return implicitHeight
@ -134,7 +129,13 @@ Item {
} }
button.clicked() button.clicked()
button.forceActiveFocus() if (button.KeyNavigation.tab || button.KeyNavigation.backtab) {
// Only focus the button if it is set up for keyboard
// navigation. This avoid getting a strange focus frame around
// buttons which are usually not focusable, such as buttons in
// a toolbar.
button.forceActiveFocus();
}
if (defaultAction) { if (defaultAction) {
defaultAction.trigger() defaultAction.trigger()
@ -155,7 +156,7 @@ Item {
imagePath: "widgets/button" imagePath: "widgets/button"
prefix: (internal.userPressed || checked) ? "pressed" : "normal" prefix: (internal.userPressed || checked) ? "pressed" : "normal"
//internal: if there is no hover status, don't paint on mouse over in touchscreens //internal: if there is no hover status, don't paint on mouse over in touchscreens
opacity: (internal.userPressed || checked || !flat || (shadow.hasOverState && mouse.containsMouse)) ? 1 : 0 opacity: (internal.userPressed || checked || !flat || parent.activeFocus || (shadow.hasOverState && mouse.containsMouse)) ? 1 : 0
Behavior on opacity { Behavior on opacity {
PropertyAnimation { duration: 100 } PropertyAnimation { duration: 100 }
} }