git.iko.soy/unity8
on xenial help sign in
add outter margin and a comment explaining the dummy container
9aff648Lukáš Tinkl
qml/Components/KeyboardShortcutsOverlay.qml+1−1
compare with xenial
unifiedsplit
@@ -28,7 +28,7 @@ Rectangle {
28 readonly property int maxTextSize: (root.parent.width / 4) - padding
28 readonly property int maxTextSize: (root.parent.width / 4) - padding
29 readonly property int padding: units.gu(4)
29 readonly property int padding: units.gu(4)
30
30
31− Item {
31+ Item { // dummy container to break binding loops *and* keep the margins in topLayout working
32 GridLayout {
32 GridLayout {
33 id: topLayout
33 id: topLayout
34 anchors.fill: parent
34 anchors.fill: parent
qml/Shell.qml+2−2
@@ -619,8 +619,8 @@ Item {
619
619
620 KeyboardShortcutsOverlay {
620 KeyboardShortcutsOverlay {
621 objectName: "shortcutsOverlay"
621 objectName: "shortcutsOverlay"
622− visible: launcher.shortcutHintsShown && width < parent.width - (launcher.lockedVisible ? launcher.panelWidth : 0)
622+ visible: launcher.shortcutHintsShown && width < parent.width - (launcher.lockedVisible ? launcher.panelWidth : 0) - padding
623− && height < parent.height
623+ && height < parent.height - padding
624 enabled: visible
624 enabled: visible
625 anchors.centerIn: parent
625 anchors.centerIn: parent
626 anchors.horizontalCenterOffset: launcher.lockedVisible ? launcher.panelWidth/2 : 0
626 anchors.horizontalCenterOffset: launcher.lockedVisible ? launcher.panelWidth/2 : 0