git.iko.soy/unity8
on xenial help sign in
Remove unused orientationAngle properties
1844ea1Daniel d'Andrada
qml/Dash/Apps/RunningApplicationTile.qml−3
compare with xenial
unifiedsplit
@@ -32,9 +32,6 @@ AbstractButton {
32 width: thumbnail.width
32 width: thumbnail.width
33 height: thumbnail.height + labelContainer.height
33 height: thumbnail.height + labelContainer.height
34
34
35− // Orientation angle of the Shell UI, relative to the scene (QQuickView's) root item.
36− property int orientationAngle
37−
38 property bool terminationModeEnabled: false
35 property bool terminationModeEnabled: false
39
36
40 onClicked: {
37 onClicked: {
qml/Dash/Apps/RunningApplicationsGrid.qml−3
@@ -28,8 +28,6 @@ ResponsiveFlowView {
28 property alias enableHeightBehavior: heightBehaviour.enabled
28 property alias enableHeightBehavior: heightBehaviour.enabled
29 property bool enableHeightBehaviorOnNextCreation: model.count === 0
29 property bool enableHeightBehaviorOnNextCreation: model.count === 0
30
30
31− property int orientationAngle
32−
33 Behavior on height {
31 Behavior on height {
34 id: heightBehaviour
32 id: heightBehaviour
35 enabled: false
33 enabled: false
@@ -65,7 +63,6 @@ ResponsiveFlowView {
65 RunningApplicationTile {
63 RunningApplicationTile {
66 id: runningAppTile
64 id: runningAppTile
67 objectName: "runningAppTile " + model.name
65 objectName: "runningAppTile " + model.name
68− orientationAngle: root.orientationAngle
69 anchors {
66 anchors {
70 top: parent.top
67 top: parent.top
71 horizontalCenter: parent.horizontalCenter
68 horizontalCenter: parent.horizontalCenter
qml/Dash/Dash.qml−3
@@ -26,8 +26,6 @@ Showable {
26
26
27 visible: shown
27 visible: shown
28
28
29− property int orientationAngle
30−
31 property ListModel searchHistory: SearchHistoryModel {}
29 property ListModel searchHistory: SearchHistoryModel {}
32 property bool searchable: !dashContent.previewOpen && !scopeItem.previewOpen
30 property bool searchable: !dashContent.previewOpen && !scopeItem.previewOpen
33
31
@@ -76,7 +74,6 @@ Showable {
76 objectName: "dashContent"
74 objectName: "dashContent"
77 width: parent.width
75 width: parent.width
78 height: parent.height
76 height: parent.height
79− orientationAngle: dash.orientationAngle
80 model: filteredScopes
77 model: filteredScopes
81 scopes: scopes
78 scopes: scopes
82 searchHistory: dash.searchHistory
79 searchHistory: dash.searchHistory
qml/Dash/DashContent.qml−5
@@ -23,7 +23,6 @@ import "../Components"
23Item {
23Item {
24 id: dashContent
24 id: dashContent
25
25
26− property int orientationAngle
27 property var model: null
26 property var model: null
28 property var scopes: null
27 property var scopes: null
29 readonly property alias currentIndex: dashContentList.currentIndex
28 readonly property alias currentIndex: dashContentList.currentIndex
@@ -154,10 +153,6 @@ Item {
154 item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
153 item.isCurrent = Qt.binding(function() { return visible && ListView.isCurrentItem })
155 item.tabBarHeight = dashPageHeader.implicitHeight;
154 item.tabBarHeight = dashPageHeader.implicitHeight;
156 dashContent.scopeLoaded(item.scope.id)
155 dashContent.scopeLoaded(item.scope.id)
157−
158− if ("orientationAngle" in item) {
159− item.orientationAngle = Qt.binding(function() { return dashContent.orientationAngle })
160− }
161 }
156 }
162 Connections {
157 Connections {
163 target: isCurrent ? scope : null
158 target: isCurrent ? scope : null
qml/Dash/GenericScopeView.qml−5
@@ -25,7 +25,6 @@ import "../Components/ListItems" as ListItems
25FocusScope {
25FocusScope {
26 id: scopeView
26 id: scopeView
27
27
28− property int orientationAngle
29 property var scope: null
28 property var scope: null
30 property SortFilterProxyModel categories: categoryFilter
29 property SortFilterProxyModel categories: categoryFilter
31 property bool isCurrent: false
30 property bool isCurrent: false
@@ -167,10 +166,6 @@ FocusScope {
167 item.model = Qt.binding(function() { return results })
166 item.model = Qt.binding(function() { return results })
168 }
167 }
169
168
170− if ("orientationAngle" in item) {
171− item.orientationAngle = Qt.binding(function() { return scopeView.orientationAngle })
172− }
173−
174 item.objectName = Qt.binding(function() { return categoryId })
169 item.objectName = Qt.binding(function() { return categoryId })
175 if (item.expandable) {
170 if (item.expandable) {
176 var shouldFilter = categoryId != categoryView.expandedCategoryId;
171 var shouldFilter = categoryId != categoryView.expandedCategoryId;
qml/OrientedShell.qml−1
@@ -135,6 +135,5 @@ Item {
135 Shell {
135 Shell {
136 id: shell
136 id: shell
137 transformOrigin: Item.TopLeft
137 transformOrigin: Item.TopLeft
138− orientationAngle: orientedShell.acceptedOrientationAngle
139 }
138 }
140}
139}
qml/Shell.qml−4
@@ -36,8 +36,6 @@ import Unity.Notifications 1.0 as NotificationBackend
36FocusScope {
36FocusScope {
37 id: shell
37 id: shell
38
38
39− property int orientationAngle
40−
41 property int supportedScreenOrientations: {
39 property int supportedScreenOrientations: {
42 if (stages.shown && ApplicationManager.topmostApplication) {
40 if (stages.shown && ApplicationManager.topmostApplication) {
43 return ApplicationManager.topmostApplication.supportedOrientations;
41 return ApplicationManager.topmostApplication.supportedOrientations;
@@ -124,8 +122,6 @@ FocusScope {
124 id: dash
122 id: dash
125 objectName: "dash"
123 objectName: "dash"
126
124
127− orientationAngle: shell.orientationAngle
128−
129 available: !greeter.shown && !lockscreen.shown
125 available: !greeter.shown && !lockscreen.shown
130 hides: [stages, launcher, panel.indicators]
126 hides: [stages, launcher, panel.indicators]
131 shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0
127 shown: disappearingAnimationProgress !== 1.0 && greeterWrapper.showProgress !== 1.0