281ec3e · unity8 · git.iko.soy

143 // Whether the underlay is fully covered by opaque UI elements.

144 property bool fullyCovered: panel.indicators.fullyOpened && shell.width <= panel.indicatorsMenuWidth

145

146− readonly property bool applicationRunning: ((mainStage.applications && mainStage.applications.count > 0)

146+ readonly property bool mainStageApplicationRunning: mainStage.applications && mainStage.applications.count > 0

147− || (sideStage.applications && sideStage.applications.count > 0))

147+ readonly property bool sideStageApplicationRunning: sideStage.applications && sideStage.applications.count > 0

148

149 // Whether the user should see the topmost application surface (if there's one at all).

150− readonly property bool applicationSurfaceShouldBeSeen: applicationRunning && !stages.fullyHidden

150+ readonly property bool mainStageApplicationShown: mainStageApplicationRunning && !stages.fullyHidden

151 && !mainStage.usingScreenshots // but want sideStage animating over app surface

152

153

154

155 // NB! Application surfaces are stacked behing the shell one. So they can only be seen by the user

156 // through the translucent parts of the shell surface.

157− visible: !fullyCovered && !applicationSurfaceShouldBeSeen

157+ visible: !fullyCovered && !mainStageApplicationShown

158−

158+

159− Rectangle {

159+ Item {

160− anchors.fill: parent

160+ id: underlayClipper

161− color: "black"

161+ clip: !parent.mainStageApplicationShown && parent.sideStageApplicationRunning && stagesOuterContainer.showProgress > 0

162− opacity: dash.disappearingAnimationProgress

162+ width: {

163− }

163+ if (clip) {

164+ var w = parent.width - sideStage.width;

165+ console.log("UCW", stagesOuterContainer.x, stages.x, "\n");

166+ w += stagesOuterContainer.x + stages.x

167+ return Math.min(w, parent.width);

168+ } else {

169+ return parent.width;

170+ }

171+ }

172+ height: parent.height

164

173

165− Image {

174+ Rectangle {

175+ width: underlay.width

176+ height: underlay.height

177+ color: "black"

178+ opacity: dash.disappearingAnimationProgress

179+ }

180+

181+ Image {

166− anchors.fill: dash

182+ anchors.fill: dash

167− source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"

183+ source: shell.width > shell.height ? "Dash/graphics/paper_landscape.png" : "Dash/graphics/paper_portrait.png"

168− fillMode: Image.PreserveAspectCrop

184+ fillMode: Image.PreserveAspectCrop

169− horizontalAlignment: Image.AlignRight

185+ horizontalAlignment: Image.AlignRight

170− verticalAlignment: Image.AlignTop

186+ verticalAlignment: Image.AlignTop

187+ }

188+

189+ Dash {

190+ id: dash

191+ objectName: "dash"

192+

193+ available: !greeter.shown && !lockscreen.shown

194+ hides: [stages, launcher, panel.indicators]

195+ shown: disappearingAnimationProgress !== 1.0

196+ enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled

197+ // FIXME: unfocus all applications when going back to the dash

198+ onEnabledChanged: {

199+ if (enabled) {

200+ shell.applicationManager.unfocusCurrentApplication()

201+ }

171− }

202+ }

172

203

173− Dash {

204+ width: underlay.width

174− id: dash

205+ height: underlay.height - y

175− objectName: "dash"

206+ y: panel.panelHeight

176−

207+

177− available: !greeter.shown && !lockscreen.shown

208+ contentScale: 1.0 - 0.2 * disappearingAnimationProgress

178− hides: [stages, launcher, panel.indicators]

209+ opacity: 1.0 - disappearingAnimationProgress

179− shown: disappearingAnimationProgress !== 1.0

210+ property real disappearingAnimationProgress: {

180− enabled: disappearingAnimationProgress === 0.0 && edgeDemo.dashEnabled

211+ if (greeter.shown) {

181− // FIXME: unfocus all applications when going back to the dash

212+ return greeter.showProgress;

182− onEnabledChanged: {

213+ } else {

183− if (enabled) {

214+ if (underlayClipper.clip)

184− shell.applicationManager.unfocusCurrentApplication()

215+ return stagesOuterContainer.showProgress * 0.5;

216+ else

217+ return stagesOuterContainer.showProgress;

218+ }

185 }

219 }

186− }

187

220

188− anchors {

221+ // FIXME: only necessary because stagesOuterContainer.showProgress and

189− fill: parent

222+ // greeterRevealer.animatedProgress are not animated

190− topMargin: panel.panelHeight

223+ Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}

191 }

224 }

192

225

193− contentScale: 1.0 - 0.2 * disappearingAnimationProgress

226+ AbstractButton {

194− opacity: 1.0 - disappearingAnimationProgress

195− property real disappearingAnimationProgress: {

196− if (greeter.shown) {

197− return greeter.showProgress;

198− } else {

199− return stagesOuterContainer.showProgress;

227+ enabled: stagesOuterContainer.showProgress == 1

228+ onEnabledChanged: console.log("AbstractButton enabled", enabled, "\n");

229+ anchors.fill: parent

230+ onClicked: {

231+ console.log("CLICKED\n");

232+ stages.hide()

200 }

233 }

201 }

234 }

202−

203− // FIXME: only necessary because stagesOuterContainer.showProgress and

204− // greeterRevealer.animatedProgress are not animated

205− Behavior on disappearingAnimationProgress { SmoothedAnimation { velocity: 5 }}

206 }

235 }

207 }

236 }

208

237

548 }

577 }

549

578

550 InputFilterArea {

579 InputFilterArea {

551− anchors.fill: parent

580+ width: {

581+ if (applicationManager.sideStageFocusedApplication)

582+ return parent.width - sideStage.width;

583+ else

584+ return parent.width;

585+ }

586+ height: parent.height

552− blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown

587+ blockInput: !applicationManager.mainStageFocusedApplication || greeter.shown || lockscreen.shown || launcher.shown

553 || panel.indicators.shown || hud.shown

588 || panel.indicators.shown || hud.shown

554 }

589 }

555

590