~osomon/dialer-app/autopkgtest

« back to all changes in this revision

Viewing changes to src/qml/dialer-app.qml

  • Committer: CI Train Bot
  • Author(s): Nick Dedekind, Gerry Boland
  • Date: 2016-04-29 21:10:46 UTC
  • mfrom: (512.1.3 dialer-app)
  • Revision ID: ci-train-bot@canonical.com-20160429211046-izp9piddub272kv8
Fixes for dynamic grid units support: set implicit sizes on MainView, and have min/max window size update on GU change

Show diffs side-by-side

added added

removed removed

Lines of Context:
65
65
    }
66
66
 
67
67
    automaticOrientation: false
68
 
    width: units.gu(40)
69
 
    height: units.gu(71)
 
68
    implicitWidth: units.gu(40)
 
69
    implicitHeight: units.gu(71)
70
70
 
71
71
    property bool hasCalls: callManager.hasCalls
72
72
 
479
479
        pageStackNormalMode.push(Qt.createComponent("DialerPage/DialerPage.qml"))
480
480
 
481
481
        // when running in windowed mode, do not allow resizing
482
 
        view.minimumWidth  = width * 0.9
483
 
        view.maximumWidth = width * 1.1
484
 
        view.minimumHeight = height * 0.9
485
 
        view.maximumHeight = height * 1.1
 
482
        view.minimumWidth  = Qt.binding( function() { return implicitWidth * 0.9; } )
 
483
        view.maximumWidth = Qt.binding( function() { return implicitWidth * 1.1; } )
 
484
        view.minimumHeight = Qt.binding( function() { return implicitHeight * 0.9; } )
 
485
        view.maximumHeight = Qt.binding( function() { return implicitHeight * 1.1; } )
486
486
 
487
487
        // if there are calls, even if we don't have info about them yet, push the livecall view
488
488
        if (callManager.hasCalls) {