← Back to branch summary

~mterry/unity8/notify-authenticated

« back to all changes in this revision

Viewing changes to qml/Dash/ScopesOverview.qml

  • Committer: Michael Terry
  • Date: 2014-08-21 12:53:29 UTC
  • mfrom: (1161.1.23 unity8)
  • Revision ID: michael.terry@canonical.com-20140821125329-8c14utjip4id3e7m
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Dash/ScopesOverview.qml
32
32
    property alias currentTab: tabBar.currentTab
33
33
 
34
34
    // Properties used by parent
35
 
    readonly property bool processing: searchResultsViewer.processing || tempScopeItem.processing
 
35
    readonly property bool processing: searchResultsViewer.processing || tempScopeItem.processing || previewListView.processing
36
36
    property bool growingDashFromPos: false
37
37
    readonly property bool searching: scope && scope.searchQuery == ""
38
38
    readonly property bool showingNonFavoriteScope: tempScopeItem.scope != null
366
366
            }
367
367
 
368
368
            function itemPressedAndHeld(index, itemModel, resultsModel, limitedCategoryItemCount) {
369
 
                // Do nothing
 
369
                if (itemModel.uri.indexOf("scope://") === 0) {
 
370
                    // Preview can call openScope so make sure restorePosition and restoreSize are set
 
371
                    scopesOverviewXYScaler.restorePosition = undefined;
 
372
                    scopesOverviewXYScaler.restoreSize = allCardSize;
 
373
 
 
374
                    previewListView.model = resultsModel;
 
375
                    previewListView.currentIndex = -1;
 
376
                    previewListView.currentIndex = index;
 
377
                    previewListView.open = true;
 
378
                }
370
379
            }
371
380
        }
372
381
 
400
409
                    border.color: "white"
401
410
                    border.width: units.dp(1)
402
411
                    radius: units.dp(10)
403
 
                    color: parent.pressed ? "gray" : "transparent"
 
412
                    color: parent.pressed ? Theme.palette.normal.baseText : "transparent"
404
413
                }
405
414
                Label {
406
415
                    id: label
455
464
        anchors.left: scopesOverviewContent.right
456
465
    }
457
466
 
458
 
 
459
 
 
460
467
    Item {
461
468
        id: scopesOverviewXYScaler
462
469
        width: parent.width