Make sure SEARCH goes away when in previews.
commit9316aa3bea9bfde9c7cf09697adcccff858fcdc9
authorMichał Sawicz <michal.sawicz@canonical.com>
dateThu 20 Feb 2014, 11:31 (13 years ago)
parentc4097b5
qml/Dash/Dash.qml+1
@@ -27,6 +27,7 @@ Showable {
2727 visible: shown
2828
2929 property ListModel searchHistory: SearchHistoryModel {}
30+ property bool searchable: !dashContent.previewOnScreen && !scopeItem.previewOnScreen
3031
3132 property alias contentProgress: dashContent.contentProgress
3233 property string showScopeOnLoaded: "clickscope"
qml/Dash/DashContent.qml+1
@@ -26,6 +26,7 @@ Item {
2626 property var scopes: null
2727 property real contentProgress: Math.max(0, Math.min(dashContentList.contentX / (dashContentList.contentWidth - dashContentList.width), units.dp(1)))
2828 property alias currentIndex: dashContentList.currentIndex
29+ property alias previewOnScreen: previewListView.onScreen
2930
3031 property ScopeDelegateMapper scopeMapper : ScopeDelegateMapper {}
3132 property ListModel searchHistory
qml/Dash/ScopeItem.qml+1
@@ -23,6 +23,7 @@ Item {
2323 id: root
2424
2525 property alias scope: scopeView.scope
26+ property alias previewOnScreen: previewListView.onScreen
2627
2728 property ListModel searchHistory
2829
qml/Shell.qml+1−1
@@ -600,7 +600,7 @@ FocusScope {
600600 contentEnabled: edgeDemo.panelContentEnabled
601601 }
602602 fullscreenMode: shell.fullscreenMode
603− searchVisible: !greeter.shown && !lockscreen.shown && dash.shown
603+ searchVisible: !greeter.shown && !lockscreen.shown && dash.shown && dash.searchable
604604
605605 InputFilterArea {
606606 anchors {