diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-08 19:23:16 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-11-10 07:59:35 +0100 |
| commit | 8db1db70559df25cf2b774f90a6bff6ecac19901 (patch) | |
| tree | 58c81c6967bd269492dc577ccce39b301f608adc /vcl/unx | |
| parent | 2dd61fb32ba325226a708e8c6e9f4def8028e612 (diff) | |
get size correct for virtual devices
Change-Id: I8fff04f561d57083c65a87ad5bd0e04cb9b9ed2c
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/generic/gdi/gdiimpl.cxx | 6 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/gdiimpl.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/generic/gdi/salgdi.cxx | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx index 6b90220a0ac8..f2ccf9080251 100644 --- a/vcl/unx/generic/gdi/gdiimpl.cxx +++ b/vcl/unx/generic/gdi/gdiimpl.cxx @@ -159,6 +159,12 @@ void X11SalGraphicsImpl::Init( SalFrame* /*pFrame*/ ) mnBrushPixel = mrParent.GetPixel( mnBrushColor ); } +void X11SalGraphicsImpl::Init( SalVirtualDevice* /*pVDev*/ ) +{ + mnPenPixel = mrParent.GetPixel( mnPenColor ); + mnBrushPixel = mrParent.GetPixel( mnBrushColor ); +} + XID X11SalGraphicsImpl::GetXRenderPicture() { XRenderPeer& rRenderPeer = XRenderPeer::GetInstance(); diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx index b4fb21cb4142..799e05c9c607 100644 --- a/vcl/unx/generic/gdi/gdiimpl.hxx +++ b/vcl/unx/generic/gdi/gdiimpl.hxx @@ -110,6 +110,8 @@ public: virtual void Init( SalFrame* pFrame ) SAL_OVERRIDE; + virtual void Init( SalVirtualDevice* pVDev ) SAL_OVERRIDE; + virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; // // get the depth of the device diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx index bce862562ae4..0607cac223af 100644 --- a/vcl/unx/generic/gdi/salgdi.cxx +++ b/vcl/unx/generic/gdi/salgdi.cxx @@ -150,17 +150,18 @@ void X11SalGraphics::SetDrawable( Drawable aDrawable, SalX11Screen nXScreen ) Window aWin = dynamic_cast<X11WindowProvider*>(m_pFrame)->GetX11Window(); pOpenGLImpl->GetOpenGLContext().init(GetXDisplay(), aWin, m_nXScreen.getXScreen()); + mpImpl->Init( m_pFrame ); } else if (m_pVDev) { pOpenGLImpl->GetOpenGLContext().init(GetXDisplay(), m_pVDev->GetDrawable(), m_pVDev->GetWidth(), m_pVDev->GetHeight(), m_nXScreen.getXScreen()); + mpImpl->Init(m_pVDev); } else SAL_WARN("vcl.opengl", "what happened here?"); } - mpImpl->Init( m_pFrame ); // TODO: moggi: FIXME nTextPixel_ = GetPixel( nTextColor_ ); } } |