← Back to branch summary

~artmello/gallery-app/gallery-app-convergence_fullscreen

« back to all changes in this revision

Viewing changes to rc/qml/MainScreen.qml

  • Committer: Arthur Mello
  • Date: 2016-01-28 13:01:40 UTC
  • Revision ID: arthur.mello@canonical.com-20160128130140-1o07rv0b1s5q6p7j
Update properties names

Show diffs side-by-side

added added

removed removed

Lines of Context:
rc/qml/MainScreen.qml
39
39
    property bool applicationLoaded: application.allLoaded
40
40
 
41
41
    //fullScreen property is used on autopilot tests
42
 
    property bool fullScreen: APP.fullScreen
 
42
    property bool fullScreen: APP.fullScreenAppMode || APP.fullScreenUserMode
43
43
   
44
44
    property alias currentPage: pageStack.currentPage
45
45
 
125
125
    Timer {
126
126
        id: setFullScreenTimer
127
127
        interval: 10;
128
 
        onTriggered: setFullScreen(!header.visible)
 
128
        onTriggered: setFullScreenAppMode(!header.visible)
129
129
    }
130
130
 
131
131
    PageStack {
288
288
            target: photoViewerLoader.item
289
289
            onCloseRequested: {
290
290
                if (!APP.desktopMode)
291
 
                    setFullScreen(false);
 
291
                    setFullScreenAppMode(false);
292
292
                popPage();
293
293
                photoViewerLoader.item.fadeClosed();
294
294
                overview.mediaCurrentlyInView = "";