ccf5cfe · unity8 · git.iko.soy

on xenial help sign in

Replace OrientationHelper as it seems to confuse Qt's internal geometry calculations

ccf5cfeGerry Boland13 years ago

qml/Shell.qml+1

@@ -37,6 +37,7 @@ import Unity.Notifications 1.0 as NotificationBackend

38FocusScope {

39 id: shell

40+ objectName: "shell"

41 // this is only here to select the width / height of the window if not running fullscreen

42 // this is only here to select the width / height of the window if not running fullscreen

42 property bool tablet: false

43 property bool tablet: false

qml/ShellOrientator.qml+7−6

@@ -16,7 +16,6 @@

17import QtQuick 2.0

18import QtQuick.Window 2.0

19−import Ubuntu.Components 0.1

20import Unity.Application 0.1

19import Unity.Application 0.1

22Item {

21Item {

@@ -27,12 +26,14 @@ Item {

27 width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)

26 width: tablet ? units.gu(160) : applicationArguments.hasGeometry() ? applicationArguments.width() : units.gu(40)

28 height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)

27 height: tablet ? units.gu(100) : applicationArguments.hasGeometry() ? applicationArguments.height() : units.gu(71)

30− OrientationHelper {

29+ Item {

30+ anchors.fill: parent

31− orientationAngle: Screen.angleBetween(nativeOrientation, Screen.primaryOrientation)

31+ rotation: Screen.angleBetween(nativeOrientation, Screen.primaryOrientation)

32− transitionEnabled: false

33 Shell {

32 Shell {

34− id: shell

33+ x: (rotation != 0) ? 0 : (parent.width - parent.height) / 2

35− anchors.fill: parent

34+ y: (rotation != 0) ? 0 : -(parent.width - parent.height) / 2

35+ width: (rotation != 0) ? parent.width : parent.height

36+ height: (rotation != 0) ? parent.height : parent.width

36 }

37 }

38 }