← Back to branch summary

~mterry/unity8/shutdown-dialog-on-resume

« back to all changes in this revision

Viewing changes to qml/Stages/DecoratedWindow.qml

  • Committer: Michael Terry
  • Date: 2015-10-27 14:54:06 UTC
  • mfrom: (2004.1.15 trunk)
  • Revision ID: michael.terry@canonical.com-20151027145406-bc3defgr08yo6fdq
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Stages/DecoratedWindow.qml
31
31
    property bool highlightShown: false
32
32
    property real shadowOpacity: 1
33
33
 
34
 
    signal close();
35
 
    signal maximize();
36
 
    signal minimize();
 
34
    signal close()
 
35
    signal maximize()
 
36
    signal minimize()
 
37
    signal decorationPressed()
37
38
 
38
39
    BorderImage {
39
40
        anchors {
61
62
 
62
63
    WindowDecoration {
63
64
        id: decoration
 
65
        target: root.parent
64
66
        objectName: application ? "appWindowDecoration_" + application.appId : "appWindowDecoration_null"
65
67
        anchors { left: parent.left; top: parent.top; right: parent.right }
66
68
        height: units.gu(3)
67
 
        title: model.name
 
69
        title: window.title !== "" ? window.title : model.name
68
70
        onClose: root.close();
69
71
        onMaximize: root.maximize();
70
72
        onMinimize: root.minimize();
 
73
        onPressed: root.decorationPressed();
71
74
        visible: decorationShown
72
75
    }
73
76