git.iko.soy/unity8
on xenial help sign in
fix focus issues
bae5b7eLukáš Tinkl
qml/Launcher/Launcher.qml+3−1
compare with xenial
unifiedsplit
@@ -352,7 +352,6 @@ FocusScope {
352 width: Math.min(root.width, units.gu(90)) * .9
352 width: Math.min(root.width, units.gu(90)) * .9
353 panelWidth: panel.width
353 panelWidth: panel.width
354 visible: x > -width
354 visible: x > -width
355− focus: visible
356
355
357 Behavior on anchors.rightMargin {
356 Behavior on anchors.rightMargin {
358 enabled: !dragArea.dragging && !launcherDragArea.drag.active && panel.animate && !drawer.draggingHorizontally
357 enabled: !dragArea.dragging && !launcherDragArea.drag.active && panel.animate && !drawer.draggingHorizontally
@@ -465,6 +464,8 @@ FocusScope {
465 onPassed: {
464 onPassed: {
466 if (root.drawerEnabled) {
465 if (root.drawerEnabled) {
467 root.switchToNextState("drawer");
466 root.switchToNextState("drawer");
467+ root.focus = true;
468+ drawer.focus = true;
468 }
469 }
469 }
470 }
470
471
@@ -521,6 +522,7 @@ FocusScope {
521 if (root.drawerEnabled && distance > panel.width * 3) {
522 if (root.drawerEnabled && distance > panel.width * 3) {
522 root.switchToNextState("drawer")
523 root.switchToNextState("drawer")
523 root.focus = true;
524 root.focus = true;
525+ drawer.focus = true;
524 } else {
526 } else {
525 root.switchToNextState("visible")
527 root.switchToNextState("visible")
526 }
528 }