← Back to branch summary

~ci-train-bot/qtubuntu/qtubuntu-ubuntu-yakkety-2010

« back to all changes in this revision

Viewing changes to src/ubuntumirclient/window.h

  • Committer: Bileto Bot
  • Author(s): Gerry Boland
  • Date: 2016-08-09 23:00:16 UTC
  • mfrom: (328.3.4 eglconvenience-retry)
  • Revision ID: ci-train-bot@canonical.com-20160809230016-nutnvedrejhvzrdc
Reapply rev 324 plus fix: EGL convenience, plus workaround for hybris not supporting GLESv3. (LP: #1507817, #1594198)

Approved by: Daniel d'Andrada, Unity8 CI Bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ubuntumirclient/window.h
40
40
    Q_OBJECT
41
41
public:
42
42
    UbuntuWindow(QWindow *w, const QSharedPointer<UbuntuClipboard> &clipboard,
43
 
                 UbuntuInput *input, UbuntuNativeInterface* native, EGLDisplay eglDisplay, EGLConfig eglConfig,
 
43
                 UbuntuInput *input, UbuntuNativeInterface* native, EGLDisplay eglDisplay,
44
44
                 MirConnection *mirConnection);
45
45
    virtual ~UbuntuWindow();
46
46
 
54
54
    void propagateSizeHints() override;
55
55
    bool isExposed() const override;
56
56
 
 
57
    QSurfaceFormat format() const override;
 
58
 
57
59
    // Additional Window properties exposed by NativeInterface
58
60
    MirFormFactor formFactor() const { return mFormFactor; }
59
61
    float scale() const { return mScale; }