git.iko.soy/unity8
on xenial help sign in
Fix anchoring
7a90301Josh Arenson
qml/Shell.qml+4−1
compare with xenial
unifiedsplit
@@ -325,6 +325,7 @@ Item {
325 target: SurfaceManager
325 target: SurfaceManager
326 onSurfaceCreated: {
326 onSurfaceCreated: {
327 if (surface.type == MirSurfaceItem.InputMethod) {
327 if (surface.type == MirSurfaceItem.InputMethod) {
328+ }
328 inputMethod.surface = surface;
329 inputMethod.surface = surface;
329 }
330 }
330 }
331 }
@@ -352,6 +353,8 @@ Item {
352
353
353 Loader {
354 Loader {
354 id: greeterLoader
355 id: greeterLoader
356+ anchors.fill: parent
357+ anchors.topMargin: panel.panelHeight
355 sourceComponent: shellMode != "shell" ? integratedGreeter :
358 sourceComponent: shellMode != "shell" ? integratedGreeter :
356 Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml"));
359 Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml"));
357 }
360 }
@@ -368,7 +371,7 @@ Item {
368 opacity: shellMode == "shell" ? 0 : 1.0
371 opacity: shellMode == "shell" ? 0 : 1.0
369 background: shell.background
372 background: shell.background
370
373
371− height: parent.parent.height; width: parent.parent.width
374+ //height: parent.parent.height; width: parent.parent.width
372 //anchors.topMargin: panel.panelHeight
375 //anchors.topMargin: panel.panelHeight
373
376
374 // avoid overlapping with Launcher's edge drag area
377 // avoid overlapping with Launcher's edge drag area