diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:13:32 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2008-01-14 15:13:32 +0000 |
| commit | d09ada8e4cc5c01cafbcd2c8c0569ae381c84dff (patch) | |
| tree | bfb61724e29a6f891db17f166199f8aad105e461 /vcl/aqua/inc/salgdi.h | |
| parent | 9ac7757416d4edc71bbd6f1a62c97e1864141962 (diff) | |
INTEGRATION: CWS aquavcl04 (1.33.2); FILE MERGED
2007/12/06 14:11:40 hdu 1.33.2.3: #i84313# fix GetFontMetric() when a stretched font is set
2007/12/06 12:55:02 pl 1.33.2.2: #i84306# react on display changes
2007/10/31 14:03:53 pl 1.33.2.1: #i77489# implement shaping
Diffstat (limited to 'vcl/aqua/inc/salgdi.h')
| -rw-r--r-- | vcl/aqua/inc/salgdi.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h index e7b5d184fee3..ad30dbb34b70 100644 --- a/vcl/aqua/inc/salgdi.h +++ b/vcl/aqua/inc/salgdi.h @@ -4,9 +4,9 @@ * * $RCSfile: salgdi.h,v $ * - * $Revision: 1.33 $ + * $Revision: 1.34 $ * - * last change: $Author: kz $ $Date: 2007-10-09 15:09:41 $ + * last change: $Author: ihi $ $Date: 2008-01-14 16:13:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -126,6 +126,8 @@ protected: Fixed mnATSUIRotation; /// workaround to prevent ATSU overflows for huge font sizes float mfFontScale; + /// <1.0: font is squeezed, >1.0 font is stretched, else 1.0 + float mfFontStretch; /// allows text to be rendered without antialiasing bool mbNonAntialiasedText; @@ -152,6 +154,8 @@ public: void SetPrinterGraphics( CGContextRef, long nRealDPIX, long nRealDPIY, double fFakeScale ); void SetVirDevGraphics( CGContextRef xContext, bool bSCreenCompatible ); + void updateResolution(); + bool IsWindowGraphics() const { return mbWindow; } bool IsPrinterGraphics() const { return mbPrinter; } bool IsVirDevGraphics() const { return mbVirDev; } @@ -159,7 +163,7 @@ public: void ImplDrawPixel( long nX, long nY, float pColor[] ); // helper to draw single pixels bool CheckContext(); - void UpdateWindow( NSGraphicsContext* pContext ); + void UpdateWindow( NSRect& rRect ); // delivered in NSView coordinates void RefreshRect(float lX, float lY, float lWidth, float lHeight); void SetState(); |