Skip to content

C
core
Kaydet (Commit) 45306431 authored tarafından Michael Meeks's avatar Michael Meeks
Dosyalara gözat
Seçenekler

tdf#89482 - return size of system virtual device resource at construction. 

Change-Id: I832a5626b52935180f24857e56297840667eec2a
Reviewed-on: https://gerrit.libreoffice.org/14678Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst c1b9402d
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 21 deletions
vcl/headless/svpinst.cxx
Dosyayı görüntüle @ 45306431
......@@ -224,7 +224,7 @@ void SvpSalInstance::DestroyObject( SalObject* pObject )
#ifndef IOS
SalVirtualDevice* SvpSalInstance::CreateVirtualDevice( SalGraphics* /* pGraphics */,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount,
const SystemGraphicsData* /* pData */ )
{
......
vcl/inc/headless/svpinst.hxx
Dosyayı görüntüle @ 45306431
......@@ -124,7 +124,7 @@ public:
// nBitCount: 0 == Default(=as window) / 1 == Mono
// pData allows for using a system dependent graphics or device context
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) SAL_OVERRIDE;
// Printer
......
vcl/inc/opengl/x11/salvd.hxx
Dosyayı görüntüle @ 45306431
......@@ -31,7 +31,7 @@ class X11OpenGLSalVirtualDevice : public SalVirtualDevice
public:
X11OpenGLSalVirtualDevice( SalGraphics *pGraphics,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount,
const SystemGraphicsData *pData );
virtual ~X11OpenGLSalVirtualDevice();
......
vcl/inc/osx/salinst.h
Dosyayı görüntüle @ 45306431
......@@ -89,8 +89,9 @@ public:
virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE;
virtual void DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData ) SAL_OVERRIDE;
long &nDX, long &nDY,
sal_uInt16 nBitCount,
const SystemGraphicsData *pData ) SAL_OVERRIDE;
virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData ) SAL_OVERRIDE;
virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) SAL_OVERRIDE;
......
vcl/inc/quartz/salvd.h
Dosyayı görüntüle @ 45306431
......@@ -55,7 +55,7 @@ private:
void Destroy();
public:
AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData );
AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long &nDX, long &nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData );
virtual ~AquaSalVirtualDevice();
virtual SalGraphics* AcquireGraphics() SAL_OVERRIDE;
......
vcl/inc/salinst.hxx
Dosyayı görüntüle @ 45306431
......@@ -83,10 +83,12 @@ public:
// VirtualDevice
// nDX and nDY in pixels
// nBitCount: 0 == default(=as window) / 1 == mono
// pData allows for using a system dependent graphics or device context
// pData allows for using a system dependent graphics or device context,
// if a system context is passed in nDX and nDY are updated to reflect
// its size; otherwise these remain unchanged.
virtual SalVirtualDevice*
CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY,
long &rDX, long &rDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) = 0;
// Printer
......
vcl/inc/unx/gtk/gtkinst.hxx
Dosyayı görüntüle @ 45306431
......@@ -75,7 +75,7 @@ public:
virtual SalTimer* CreateSalTimer() SAL_OVERRIDE;
virtual void AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService) SAL_OVERRIDE;
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics*,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount,
const SystemGraphicsData* ) SAL_OVERRIDE;
virtual SalBitmap* CreateSalBitmap() SAL_OVERRIDE;
......
vcl/inc/unx/salinst.h
Dosyayı görüntüle @ 45306431
......@@ -54,7 +54,7 @@ public:
virtual void DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) SAL_OVERRIDE;
virtual void PostPrintersChanged() SAL_OVERRIDE;
virtual GenPspGraphics *CreatePrintGraphics() SAL_OVERRIDE;
......
vcl/inc/unx/salvd.h
Dosyayı görüntüle @ 45306431
......@@ -45,7 +45,7 @@ class X11SalVirtualDevice : public SalVirtualDevice
public:
X11SalVirtualDevice( SalGraphics *pGraphics,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount,
const SystemGraphicsData *pData );
virtual ~X11SalVirtualDevice();
......
vcl/inc/win/salinst.h
Dosyayı görüntüle @ 45306431
......@@ -42,7 +42,7 @@ public:
virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow = true ) SAL_OVERRIDE;
virtual void DestroyObject( SalObject* pObject ) SAL_OVERRIDE;
virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData ) SAL_OVERRIDE;
virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo,
ImplJobSetup* pSetupData ) SAL_OVERRIDE;
......
vcl/opengl/x11/salvd.cxx
Dosyayı görüntüle @ 45306431
......@@ -34,7 +34,7 @@ void X11SalGraphics::Init( X11OpenGLSalVirtualDevice *pDevice )
}
X11OpenGLSalVirtualDevice::X11OpenGLSalVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount,
const SystemGraphicsData *pData ) :
mbGraphics( false ),
......
vcl/quartz/salvd.cxx
Dosyayı görüntüle @ 45306431
......@@ -35,7 +35,7 @@
#include "quartz/utils.h"
SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData )
long &nDX, long &nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData )
{
// #i92075# can be called first in a thread
SalData::ensureThreadAutoreleasePool();
......@@ -54,7 +54,7 @@ SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
#endif
}
AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData )
AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long &nDX, long &nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData )
: mbGraphicsUsed( false )
, mxBitmapContext( NULL )
, mnBitmapDepth( 0 )
......@@ -65,7 +65,6 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX,
{
// Create virtual device based on existing SystemGraphicsData
// We ignore nDx and nDY, as the desired size comes from the SystemGraphicsData.
// WTF does the above mean, SystemGraphicsData has no size field(s).
mbForeignContext = true; // the mxContext is from pData (what "mxContext"? there is no such field anywhere in vcl;)
mpGraphics = new AquaSalGraphics( /*pGraphic*/ );
if (nDX == 0)
......@@ -73,6 +72,18 @@ AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX,
if (nDY == 0)
nDY = 1;
mxLayer = CGLayerCreateWithContext( pData->rCGContext, CGSizeMake( nDX, nDY), NULL );
// Interogate the context as to its real size
if (mxLayer)
{
const CGSize aSize = CGLayerGetSize( mxLayer );
nDX = static_cast<long>(aSize.width);
nDY = static_cast<long>(aSize.height);
}
else
{
nDX = 0;
nDY = 0;
}
CG_TRACE( "CGLayerCreateWithContext(" << pData->rCGContext << "," << CGSizeMake( nDX, nDY) << ",NULL) = " << mxLayer );
mpGraphics->SetVirDevGraphics( mxLayer, pData->rCGContext );
}
......
vcl/unx/generic/gdi/salvd.cxx
Dosyayı görüntüle @ 45306431
......@@ -36,7 +36,7 @@
#include <opengl/x11/salvd.hxx>
SalVirtualDevice* X11SalInstance::CreateVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount, const SystemGraphicsData *pData )
{
if (OpenGLHelper::isVCLOpenGLEnabled())
......@@ -82,7 +82,7 @@ void X11SalGraphics::Init( X11SalVirtualDevice *pDevice, SalColormap* pColormap,
}
X11SalVirtualDevice::X11SalVirtualDevice( SalGraphics* pGraphics,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount,
const SystemGraphicsData *pData ) :
m_nXScreen( 0 ),
......@@ -115,6 +115,8 @@ X11SalVirtualDevice::X11SalVirtualDevice( SalGraphics* pGraphics,
}
nDX_ = (long)w;
nDY_ = (long)h;
nDX = nDX_;
nDY = nDY_;
m_nXScreen = SalX11Screen( nScreen );
hDrawable_ = pData->hDrawable;
bExternPixmap_ = true;
......
vcl/unx/gtk/app/gtkinst.cxx
Dosyayı görüntüle @ 45306431
......@@ -309,7 +309,7 @@ void GtkYieldMutex::ThreadsLeave()
}
SalVirtualDevice* GtkInstance::CreateVirtualDevice( SalGraphics *pG,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount,
const SystemGraphicsData *pGd )
{
......
vcl/win/source/gdi/salvd.cxx
Dosyayı görüntüle @ 45306431
......@@ -67,7 +67,7 @@ HBITMAP WinSalVirtualDevice::ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY,
}
SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
long nDX, long nDY,
long &nDX, long &nDY,
sal_uInt16 nBitCount,
const SystemGraphicsData* pData )
{
......@@ -82,10 +82,20 @@ SalVirtualDevice* WinSalInstance::CreateVirtualDevice( SalGraphics* pSGraphics,
hDC = pData->hDC;
hBmp = NULL;
bOk = (hDC != NULL);
if (bOk)
{
nDX = GetDeviceCaps( hDC, HORZRES );
nDY = GetDeviceCaps( hDC, VERTRES );
}
else
{
nDX = 0;
nDY = 0;
}
}
else
{
hDC = CreateCompatibleDC( pGraphics->getHDC() );
hDC = CreateCompatibleDC( pGraphics->getHDC() );
if( !hDC )
ImplWriteLastError( GetLastError(), "CreateCompatibleDC in CreateVirtualDevice" );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment