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
This commit is contained in:
@@ -307,9 +307,10 @@ class DisplayDriver {
|
|||||||
virtual void Unlock() = 0;
|
virtual void Unlock() = 0;
|
||||||
|
|
||||||
// display mode access
|
// display mode access
|
||||||
virtual void SetMode(const display_mode &mode) = 0;
|
virtual void SetMode(const display_mode &mode);
|
||||||
virtual void GetMode(display_mode *mode) = 0;
|
virtual void GetMode(display_mode *mode);
|
||||||
virtual const display_mode* DisplayMode() = 0;
|
const display_mode* DisplayMode()
|
||||||
|
{ return &fDisplayMode; }
|
||||||
|
|
||||||
virtual bool DumpToFile(const char *path) = 0;
|
virtual bool DumpToFile(const char *path) = 0;
|
||||||
virtual ServerBitmap* DumpToBitmap() = 0;
|
virtual ServerBitmap* DumpToBitmap() = 0;
|
||||||
@@ -356,6 +357,8 @@ class DisplayDriver {
|
|||||||
// needed by Layer
|
// needed by Layer
|
||||||
virtual void ConstrainClippingRegion(BRegion *reg) = 0;
|
virtual void ConstrainClippingRegion(BRegion *reg) = 0;
|
||||||
|
|
||||||
|
protected:
|
||||||
|
display_mode fDisplayMode;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -227,7 +227,7 @@ class Painter {
|
|||||||
|
|
||||||
void _RebuildClipping();
|
void _RebuildClipping();
|
||||||
|
|
||||||
void _UpdateFont();
|
void _UpdateFont(const char* pathToFontFile = NULL);
|
||||||
void _UpdateLineWidth();
|
void _UpdateLineWidth();
|
||||||
|
|
||||||
// drawing functions stroke/fill
|
// drawing functions stroke/fill
|
||||||
|
|||||||
@@ -38,8 +38,8 @@
|
|||||||
|
|
||||||
// Display driver to be used by the server.
|
// Display driver to be used by the server.
|
||||||
#ifndef DISPLAYDRIVER
|
#ifndef DISPLAYDRIVER
|
||||||
//# define DISPLAYDRIVER PAINTERDRIVER
|
# define DISPLAYDRIVER PAINTERDRIVER
|
||||||
# define DISPLAYDRIVER VIEWDRIVER
|
//# define DISPLAYDRIVER VIEWDRIVER
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Uncomment this if the DisplayDriver should only rely on drawing functions implemented
|
// Uncomment this if the DisplayDriver should only rely on drawing functions implemented
|
||||||
|
|||||||
Reference in New Issue
Block a user