* modified 'font' member from '*font' to 'font'. '*font' was getting the pointer to system's plain font, and worse, it modified it. Now, it's all OK.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4682 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
36845b1281
commit
09c067b8e4
@ -35,8 +35,7 @@ public:
|
||||
alphaFncMode = B_ALPHA_OVERLAY;
|
||||
scale = 1.0;
|
||||
fontAliasing = true;
|
||||
font = fontserver->GetSystemPlain();
|
||||
//font = NULL;
|
||||
font = *(fontserver->GetSystemPlain());
|
||||
|
||||
clippReg = NULL;
|
||||
|
||||
@ -51,10 +50,6 @@ public:
|
||||
}
|
||||
~LayerData(void)
|
||||
{
|
||||
if(font) {
|
||||
delete font;
|
||||
font = NULL;
|
||||
}
|
||||
if (image){
|
||||
/* NOTE: I don't know yet how bitmap allocation/deallocation
|
||||
is managed by server. I tend to think it's a reference
|
||||
@ -84,7 +79,7 @@ public:
|
||||
alpha_function alphaFncMode;
|
||||
float scale;
|
||||
bool fontAliasing;
|
||||
ServerFont *font;
|
||||
ServerFont font;
|
||||
|
||||
BRegion *clippReg;
|
||||
|
||||
@ -98,3 +93,8 @@ public:
|
||||
escapement_delta edelta;
|
||||
};
|
||||
#endif
|
||||
|
||||
/*
|
||||
@log
|
||||
* modified 'font' member from '*font' to 'font'. '*font' was getting the pointer to system's plain font, and worse, it modified it. Now, it's all OK.
|
||||
*/
|
||||
|
Loading…
Reference in New Issue
Block a user