← Back to branch summary

~lukas-kde/unity8/dashboard

« back to all changes in this revision

Viewing changes to qml/Stage/DecoratedWindow.qml

  • Committer: Lukáš Tinkl
  • Date: 2017-01-26 12:13:17 UTC
  • mfrom: (2749.1.49 unity8)
  • Revision ID: lukas.tinkl@canonical.com-20170126121317-qms39s9pikclidbe
merge trunk, fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Stage/DecoratedWindow.qml
196
196
        ]
197
197
    }
198
198
 
199
 
    MouseArea {
 
199
    WindowDecoration {
 
200
        id: decoration
 
201
        objectName: "appWindowDecoration"
 
202
 
200
203
        anchors { left: parent.left; top: parent.top; right: parent.right }
201
204
        height: units.gu(3)
202
205
 
 
206
        title: applicationWindow.title
 
207
 
203
208
        opacity: root.hasDecoration ? Math.min(1, root.showDecoration) : 0
204
 
 
205
209
        Behavior on opacity { UbuntuNumberAnimation { } }
206
210
 
207
 
        drag.target: Item {}
208
 
        drag.filterChildren: true
209
 
        drag.threshold: 0
210
 
 
211
211
        onPressed: root.decorationPressed();
212
212
        onPressedChanged: moveHandler.handlePressedChanged(pressed, pressedButtons, mouseX, mouseY)
213
213
        onPositionChanged: moveHandler.handlePositionChanged(mouse)
216
216
            moveHandler.handleReleased();
217
217
        }
218
218
 
219
 
        WindowDecoration {
220
 
            id: decoration
221
 
            objectName: "appWindowDecoration"
222
 
            anchors.fill: parent
223
 
            title: applicationWindow.title
224
 
 
225
 
            onCloseClicked: root.closeClicked();
226
 
            onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
227
 
            onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
228
 
            onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
229
 
            onMinimizeClicked: root.minimizeClicked();
230
 
 
231
 
            enableMenus: {
232
 
                return active &&
233
 
                         surface &&
234
 
                          (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
235
 
            }
236
 
            menu: sharedAppModel.model
237
 
 
238
 
            Indicators.SharedUnityMenuModel {
239
 
                id: sharedAppModel
240
 
                property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
241
 
                property var menuService: menus.length > 0 ? menus[0] : undefined
242
 
 
243
 
                busName: menuService ? menuService.service : ""
244
 
                menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
245
 
                actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
246
 
            }
247
 
 
248
 
            Connections {
249
 
                target: ApplicationMenuRegistry
250
 
                onSurfaceMenuRegistered: {
251
 
                    if (surface && surfaceId === surface.persistentId) {
252
 
                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
253
 
                    }
 
219
        onCloseClicked: root.closeClicked();
 
220
        onMaximizeClicked: { root.decorationPressed(); root.maximizeClicked(); }
 
221
        onMaximizeHorizontallyClicked: { root.decorationPressed(); root.maximizeHorizontallyClicked(); }
 
222
        onMaximizeVerticallyClicked: { root.decorationPressed(); root.maximizeVerticallyClicked(); }
 
223
        onMinimizeClicked: root.minimizeClicked();
 
224
 
 
225
        enableMenus: {
 
226
            return active &&
 
227
                     surface &&
 
228
                      (PanelState.focusedPersistentSurfaceId === surface.persistentId && !PanelState.decorationsVisible)
 
229
        }
 
230
        menu: sharedAppModel.model
 
231
 
 
232
        Indicators.SharedUnityMenuModel {
 
233
            id: sharedAppModel
 
234
            property var menus: surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : []
 
235
            property var menuService: menus.length > 0 ? menus[0] : undefined
 
236
 
 
237
            busName: menuService ? menuService.service : ""
 
238
            menuObjectPath: menuService && menuService.menuPath ? menuService.menuPath : ""
 
239
            actions: menuService && menuService.actionPath ? { "unity": menuService.actionPath } : {}
 
240
        }
 
241
 
 
242
        Connections {
 
243
            target: ApplicationMenuRegistry
 
244
            onSurfaceMenuRegistered: {
 
245
                if (surface && surfaceId === surface.persistentId) {
 
246
                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
254
247
                }
255
 
                onSurfaceMenuUnregistered: {
256
 
                    if (surface && surfaceId === surface.persistentId) {
257
 
                        sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
258
 
                    }
 
248
            }
 
249
            onSurfaceMenuUnregistered: {
 
250
                if (surface && surfaceId === surface.persistentId) {
 
251
                    sharedAppModel.menus = Qt.binding(function() { return surface ? ApplicationMenuRegistry.getMenusForSurface(surface.persistentId) : [] });
259
252
                }
260
253
            }
261
254
        }