diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2014-11-29 22:55:31 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-12-02 15:47:31 +0100 |
| commit | 1cab8d5ad9c4ab6d801d51a9976245e373de14da (patch) | |
| tree | d773aa3ccf66993a42ae8d0c31139583f06a3671 /vcl/opengl/x11/gdiimpl.cxx | |
| parent | de70fa4bb738151ecb8252288d2d51e054a7858b (diff) | |
vcl: Consolidate size information around the GeometryProvider.
Conflicts:
vcl/inc/openglgdiimpl.hxx
Change-Id: I1d764a8dba1850d2475f08e1014a085846f336c3
Diffstat (limited to 'vcl/opengl/x11/gdiimpl.cxx')
| -rw-r--r-- | vcl/opengl/x11/gdiimpl.cxx | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/vcl/opengl/x11/gdiimpl.cxx b/vcl/opengl/x11/gdiimpl.cxx index 74e79d026e7d..4442bbde1a89 100644 --- a/vcl/opengl/x11/gdiimpl.cxx +++ b/vcl/opengl/x11/gdiimpl.cxx @@ -26,7 +26,7 @@ #include <vcl/opengl/OpenGLHelper.hxx> X11OpenGLSalGraphicsImpl::X11OpenGLSalGraphicsImpl( X11SalGraphics& rParent ): - OpenGLSalGraphicsImpl(), + OpenGLSalGraphicsImpl(rParent.GetGeometryProvider()), mrParent(rParent) { } @@ -35,36 +35,11 @@ X11OpenGLSalGraphicsImpl::~X11OpenGLSalGraphicsImpl() { } -GLfloat X11OpenGLSalGraphicsImpl::GetWidth() const +void X11OpenGLSalGraphicsImpl::Init() { - if( mrParent.m_pFrame ) - return mrParent.m_pFrame->maGeometry.nWidth; - else if( mrParent.m_pVDev ) - return static_cast< X11OpenGLSalVirtualDevice* >(mrParent.m_pVDev)->GetWidth(); - return 1; -} - -GLfloat X11OpenGLSalGraphicsImpl::GetHeight() const -{ - if( mrParent.m_pFrame ) - return mrParent.m_pFrame->maGeometry.nHeight; - else if( mrParent.m_pVDev ) - return static_cast< X11OpenGLSalVirtualDevice* >(mrParent.m_pVDev)->GetHeight(); - return 1; -} - -bool X11OpenGLSalGraphicsImpl::IsOffscreen() const -{ - X11WindowProvider *pProvider = dynamic_cast<X11WindowProvider*>(mrParent.m_pFrame); - if( pProvider ) - return false; - else if( mrParent.m_pVDev ) - return true; - else - { - SAL_WARN( "vcl.opengl", "what happened here?" ); - return true; - } + // The m_pFrame and m_pVDev pointers are updated late in X11 + mpParent = mrParent.GetGeometryProvider(); + OpenGLSalGraphicsImpl::Init(); } OpenGLContext* X11OpenGLSalGraphicsImpl::CreateWinContext() |