on xenial help sign in
test fixes
a9caa24Nick Dedekind
qml/Stages/DesktopStage.qml+8−5
@@ -369,8 +369,10 @@ AbstractStage {
369 name: "fullscreen"; when: decoratedWindow.fullscreen
369 name: "fullscreen"; when: decoratedWindow.fullscreen
370 PropertyChanges {
370 PropertyChanges {
371 target: appDelegate;
371 target: appDelegate;
372+ x: 0;
372− x: 0; y: -PanelState.panelHeight
373+ y: -PanelState.panelHeight
374+ requestedWidth: appContainer.width;
373− requestedWidth: appContainer.width; requestedHeight: appContainer.height;
375+ requestedHeight: appContainer.height;
374 }
376 }
375 },
377 },
376 State {
378 State {
@@ -387,14 +389,15 @@ AbstractStage {
387 name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
389 name: "maximized"; when: appDelegate.maximized && !appDelegate.minimized
388 PropertyChanges {
390 PropertyChanges {
389 target: appDelegate;
391 target: appDelegate;
390− x: root.leftMargin; y: 0;
392+ x: root.leftMargin;
393+ y: 0;
391 visuallyMinimized: false;
394 visuallyMinimized: false;
392 visuallyMaximized: true
395 visuallyMaximized: true
393 }
396 }
394 PropertyChanges {
397 PropertyChanges {
395 target: decoratedWindow
398 target: decoratedWindow
396− requestedWidth: root.width;
399+ requestedWidth: appContainer.width - root.leftMargin;
397− requestedHeight: root.height;
400+ requestedHeight: appContainer.height;
398 }
401 }
399 },
402 },
400 State {
403 State {
tests/mocks/Unity/Application/ApplicationInfo.cpp+1−1
@@ -203,7 +203,7 @@ void ApplicationInfo::setFullscreen(bool value)
203
203
204bool ApplicationInfo::fullscreen() const
204bool ApplicationInfo::fullscreen() const
205{
205{
206− return m_session ? m_session->fullscreen() : false;
206+ return m_session ? m_session->fullscreen() : m_fullscreen;
207}
207}
208
208
209void ApplicationInfo::setManualSurfaceCreation(bool value)
209void ApplicationInfo::setManualSurfaceCreation(bool value)