~dandrader/unity8/removeApplicationStage

« back to all changes in this revision

Viewing changes to tests/qmltests/Stages/tst_DesktopStage.qml

  • Committer: Bileto Bot
  • Date: 2016-07-14 07:09:00 UTC
  • mfrom: (2525.1.5 mirSurfaceInputBounds)
  • Revision ID: ci-train-bot@canonical.com-20160714070900-8wpqiln9hnk2q05i
Make use of MirSurface::inputBounds and drop UbuntuKeyboardInfo hack

Show diffs side-by-side

added added

removed removed

Lines of Context:
534
534
            verify(dashAppDelegate);
535
535
            dashAppDelegate.requestedHeight = data.windowHeight;
536
536
            dashAppDelegate.requestedY = data.windowY;
537
 
            UbuntuKeyboardInfo.height = 0;
 
537
            SurfaceManager.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
538
538
            var initialY = dashAppDelegate.y;
539
539
            verify(initialY > PanelState.panelHeight);
540
540
 
541
 
            UbuntuKeyboardInfo.height = root.height / 2;
 
541
            SurfaceManager.inputMethodSurface.setInputBounds(Qt.rect(0, root.height / 2, root.width, root.height / 2));
542
542
            tryCompare(dashAppDelegate, "y", data.targetDisplacement);
543
543
 
544
 
            UbuntuKeyboardInfo.height = 0;
 
544
            SurfaceManager.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));
545
545
            tryCompare(dashAppDelegate, "y", initialY);
546
546
            SurfaceManager.inputMethodSurface.state = oldOSKState;
547
547
        }