From 0cabce17c35a446ed403f384b8c45a1be642cba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 29 Mar 2005 22:58:09 +0000 Subject: [PATCH] fixed some font related problems, Painter should now rely on the app_server font manager. maybe I fixed some compile problems too. Sorry if that was the case. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12145 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/servers/app/DisplayDriver.h | 9 ++++++--- headers/private/servers/app/Painter.h | 2 +- headers/private/servers/app/ServerConfig.h | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/headers/private/servers/app/DisplayDriver.h b/headers/private/servers/app/DisplayDriver.h index 67e6c24be5..c544b81efc 100644 --- a/headers/private/servers/app/DisplayDriver.h +++ b/headers/private/servers/app/DisplayDriver.h @@ -307,9 +307,10 @@ class DisplayDriver { virtual void Unlock() = 0; // display mode access - virtual void SetMode(const display_mode &mode) = 0; - virtual void GetMode(display_mode *mode) = 0; - virtual const display_mode* DisplayMode() = 0; + virtual void SetMode(const display_mode &mode); + virtual void GetMode(display_mode *mode); + const display_mode* DisplayMode() + { return &fDisplayMode; } virtual bool DumpToFile(const char *path) = 0; virtual ServerBitmap* DumpToBitmap() = 0; @@ -356,6 +357,8 @@ class DisplayDriver { // needed by Layer virtual void ConstrainClippingRegion(BRegion *reg) = 0; + protected: + display_mode fDisplayMode; }; #endif diff --git a/headers/private/servers/app/Painter.h b/headers/private/servers/app/Painter.h index c5e7d8a8b0..b8b2014eaa 100644 --- a/headers/private/servers/app/Painter.h +++ b/headers/private/servers/app/Painter.h @@ -227,7 +227,7 @@ class Painter { void _RebuildClipping(); - void _UpdateFont(); + void _UpdateFont(const char* pathToFontFile = NULL); void _UpdateLineWidth(); // drawing functions stroke/fill diff --git a/headers/private/servers/app/ServerConfig.h b/headers/private/servers/app/ServerConfig.h index ae3bfaf623..fa0de5d9a6 100644 --- a/headers/private/servers/app/ServerConfig.h +++ b/headers/private/servers/app/ServerConfig.h @@ -38,8 +38,8 @@ // Display driver to be used by the server. #ifndef DISPLAYDRIVER -//# define DISPLAYDRIVER PAINTERDRIVER -# define DISPLAYDRIVER VIEWDRIVER +# define DISPLAYDRIVER PAINTERDRIVER +//# define DISPLAYDRIVER VIEWDRIVER #endif // Uncomment this if the DisplayDriver should only rely on drawing functions implemented