← Back to branch summary

~saviq/+junk/shell-refactor-screeninfo

« back to all changes in this revision

Viewing changes to libunity-2d-private/Unity2d/GnomeBackground.qml

merge conflicts resolved

Show diffs side-by-side

added added

removed removed

Lines of Context:
libunity-2d-private/Unity2d/GnomeBackground.qml
24
24
Item {
25
25
    property string overlay_color
26
26
    property real overlay_alpha
 
27
    property int offsetX: -1
 
28
    property int offsetY: -1
27
29
    
28
30
    /* Avoid redraw at rendering */
29
31
    CacheEffect {
86
88
        /* by default, place the background on top of the desktop background,
87
89
           no matter where the DeclarativeView or the parent object are placed.
88
90
        */
89
 
        x: parent.mapFromItem(null, -declarativeView.globalPosition.x, 0).x
90
 
        y: parent.mapFromItem(null, 0, -declarativeView.globalPosition.y).y
 
91
        x: offsetX != -1 ? offsetX : parent.mapFromItem(null, -declarativeView.globalPosition.x, 0).x
 
92
        y: offsetY != -1 ? offsetY : parent.mapFromItem(null, 0, -declarativeView.globalPosition.y).y
91
93
 
92
94
        /* Possible modes are:
93
95
            - "wallpaper"