← Back to branch summary

~timo-jyrinki/mediaplayer-app/stop_depending_on_transitional_packages

« back to all changes in this revision

Viewing changes to src/qml/player/Controls.qml

  • Committer: CI Train Bot
  • Author(s): Renato Araujo Oliveira Filho
  • Date: 2016-03-23 13:39:20 UTC
  • mfrom: (381.2.19 pocket-pc-full-screen)
  • Revision ID: ci-train-bot@canonical.com-20160323133920-x06n4ioyshipfgt6
Set window flag to: 0x00800000

Value that will be handled by Unity/Mir to show a full screen when appropriate. Fixes: #1535397

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/qml/player/Controls.qml
154
154
                id: _fullScreenButton
155
155
 
156
156
                //TODO: use the correct icon based on window state
157
 
                iconSource: mpApplication.desktopMode ?
158
 
                                Window.visibility ===  Window.FullScreen ? "image://theme/view-restore" : "image://theme/view-fullscreen" :
159
 
                                "image://theme/close"
 
157
//                visible: (mpApplication.desktopMode || (Window.visibility ===  Window.FullScreen))
 
158
//                iconSource: mpApplication.desktopMode ?
 
159
//                                Window.visibility ===  Window.FullScreen ? "image://theme/view-restore" : "image://theme/view-fullscreen" :
 
160
//                                "image://theme/close"
 
161
                iconSource: "image://theme/close"
160
162
                iconSize: units.gu(3)
161
163
                anchors.verticalCenter: parent.verticalCenter
162
164
                width: visible ? units.gu(8) : 0
163
165
                height: units.gu(4)
164
166
                onClicked: controls.fullscreenClicked()
165
167
                leftAlignment: true
166
 
                visible: (mpApplication.desktopMode || (Window.visibility ===  Window.FullScreen))
167
168
            }
168
169
 
169
170
            VLine {