[Merge] lp:~nick-dedekind/qtubuntu/stagedFullscreen.form-factor into lp:qtubuntu

[Michał Sawicz]

Diff comments:

> 
> === modified file 'src/ubuntumirclient/screen.cpp'
> --- src/ubuntumirclient/screen.cpp	2015-12-09 13:01:28 +0000
> +++ src/ubuntumirclient/screen.cpp	2016-02-04 14:19:36 +0000
> @@ -278,3 +230,38 @@
>          QWindowSystemInterface::handleScreenOrientationChange(screen(), mCurrentOrientation);
>      }
>  }
> +
> +void UbuntuScreen::setMirDisplayOutput(const MirDisplayOutput &output)
> +{
> +    // Physical screen size
> +    mPhysicalSize.setWidth(output.physical_width_mm);
> +    mPhysicalSize.setHeight(output.physical_height_mm);
> +
> +    // Pixel Format
> +//    mFormat = qImageFormatFromMirPixelFormat(output.current_format); // GERRY: TODO
> +
> +    // Pixel depth
> +    mDepth = 8 * MIR_BYTES_PER_PIXEL(output.current_format);
> +
> +    MirDisplayMode mode = output.modes[output.current_mode];
> +    const int kScreenWidth = mode.horizontal_resolution;
> +    const int kScreenHeight = mode.vertical_resolution;
> +
> +    mGeometry = QRect(0, 0, kScreenWidth, kScreenHeight);
> +
> +    // Misc
> +//    mScale = output.scale; // missing from MirDisplayOutput, wait for later setAdditionalMirDisplayProperties call
> +//    mFormFactor = output.form_factor; // ditto

Bug #1535469 should be mentioned

> +    mOutputId = output.output_id;
> +
> +    // Set the default orientation based on the initial screen dimmensions.
> +    mNativeOrientation = (mGeometry.width() >= mGeometry.height()) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
> +
> +    // If it's a landscape device (i.e. some tablets), start in landscape, otherwise portrait
> +    mCurrentOrientation = (mNativeOrientation == Qt::LandscapeOrientation) ? Qt::LandscapeOrientation : Qt::PortraitOrientation;
> +}
> +
> +void UbuntuScreen::setAdditionalMirDisplayProperties(MirFormFactor formFactor)
> +{
> +    mFormFactor = formFactor;
> +}


-- 
https://code.launchpad.net/~nick-dedekind/qtubuntu/stagedFullscreen.form-factor/+merge/284979
Your team Ubuntu Phablet Team is subscribed to branch lp:qtubuntu.