git.iko.soy/unity8
on xenial help sign in
Make sure SEARCH goes away when in previews.
9316aa3Michał Sawicz
qml/Dash/Dash.qml+1
compare with xenial
unifiedsplit
@@ -27,6 +27,7 @@ Showable {
27 visible: shown
27 visible: shown
28
28
29 property ListModel searchHistory: SearchHistoryModel {}
29 property ListModel searchHistory: SearchHistoryModel {}
30+ property bool searchable: !dashContent.previewOnScreen && !scopeItem.previewOnScreen
30
31
31 property alias contentProgress: dashContent.contentProgress
32 property alias contentProgress: dashContent.contentProgress
32 property string showScopeOnLoaded: "clickscope"
33 property string showScopeOnLoaded: "clickscope"
qml/Dash/DashContent.qml+1
@@ -26,6 +26,7 @@ Item {
26 property var scopes: null
26 property var scopes: null
27 property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))
27 property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))
28 property alias currentIndex: dashContentList.currentIndex
28 property alias currentIndex: dashContentList.currentIndex
29+ property alias previewOnScreen: previewListView.onScreen
29
30
30 property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
31 property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
31 property ListModel searchHistory
32 property ListModel searchHistory
qml/Dash/ScopeItem.qml+1
@@ -23,6 +23,7 @@ Item {
23 id: root
23 id: root
24
24
25 property alias scope: scopeView.scope
25 property alias scope: scopeView.scope
26+ property alias previewOnScreen: previewListView.onScreen
26
27
27 property ListModel searchHistory
28 property ListModel searchHistory
28
29
qml/Shell.qml+1−1
@@ -600,7 +600,7 @@ FocusScope {
600 contentEnabled: edgeDemo.panelContentEnabled
600 contentEnabled: edgeDemo.panelContentEnabled
601 }
601 }
602 fullscreenMode: shell.fullscreenMode
602 fullscreenMode: shell.fullscreenMode
603− searchVisible: !greeter.shown && !lockscreen.shown && dash.shown
603+ searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
604
604
605 InputFilterArea {
605 InputFilterArea {
606 anchors {
606 anchors {