Damaged decorator redrawing with previous CI. Got that repaired now.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8357 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -471,7 +471,7 @@ void Layer::RequestDraw(const BRegion ®, Layer *startFrom)
|
|||||||
|
|
||||||
// calculate the update region, then...
|
// calculate the update region, then...
|
||||||
fUpdateReg = fVisible;
|
fUpdateReg = fVisible;
|
||||||
if (fFlags & B_FULL_UPDATE_ON_RESIZE){ }
|
if (fFlags & B_FULL_UPDATE_ON_RESIZE && fFrameAction == B_LAYER_RESIZE){ }
|
||||||
else { fUpdateReg.IntersectWith(®); }
|
else { fUpdateReg.IntersectWith(®); }
|
||||||
|
|
||||||
if (fUpdateReg.CountRects() > 0)
|
if (fUpdateReg.CountRects() > 0)
|
||||||
@@ -1015,9 +1015,9 @@ void Layer::MoveBy(float x, float y)
|
|||||||
debugger("ERROR: in Layer::MoveBy()! - No parent!\n");
|
debugger("ERROR: in Layer::MoveBy()! - No parent!\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
fFrameAction = B_LAYER_MOVE;
|
fFrameAction = B_LAYER_MOVE;
|
||||||
|
|
||||||
BPoint pt(x,y);
|
BPoint pt(x,y);
|
||||||
BRect rect(fFull.Frame().OffsetByCopy(pt));
|
BRect rect(fFull.Frame().OffsetByCopy(pt));
|
||||||
|
|
||||||
@@ -1120,9 +1120,9 @@ void Layer::ResizeBy(float x, float y)
|
|||||||
printf("ERROR: in Layer::MoveBy()! - No parent!\n");
|
printf("ERROR: in Layer::MoveBy()! - No parent!\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
fFrameAction = B_LAYER_RESIZE;
|
fFrameAction = B_LAYER_RESIZE;
|
||||||
|
|
||||||
BPoint pt(x,y);
|
BPoint pt(x,y);
|
||||||
BRect rect(fFull.Frame());
|
BRect rect(fFull.Frame());
|
||||||
rect.right += x;
|
rect.right += x;
|
||||||
@@ -1136,7 +1136,7 @@ void Layer::ResizeBy(float x, float y)
|
|||||||
EmptyGlobals();
|
EmptyGlobals();
|
||||||
|
|
||||||
fFrameAction = B_LAYER_NONE;
|
fFrameAction = B_LAYER_NONE;
|
||||||
|
|
||||||
STRACE(("Layer(%s)::ResizeBy() END\n", GetName()));
|
STRACE(("Layer(%s)::ResizeBy() END\n", GetName()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,11 +12,11 @@
|
|||||||
|
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
B_LAYER_NONE = 0x1U,
|
B_LAYER_NONE = 1,
|
||||||
B_LAYER_MOVE = 0x2U,
|
B_LAYER_MOVE = 2,
|
||||||
B_LAYER_SIMPLE_MOVE = 0x3U,
|
B_LAYER_SIMPLE_MOVE = 3,
|
||||||
B_LAYER_RESIZE = 0x4U,
|
B_LAYER_RESIZE = 4,
|
||||||
B_LAYER_MASK_RESIZE = 0x5U,
|
B_LAYER_MASK_RESIZE = 5,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum
|
enum
|
||||||
@@ -157,7 +157,7 @@ protected:
|
|||||||
bool fIsTopLayer;
|
bool fIsTopLayer;
|
||||||
uint16 fAdFlags;
|
uint16 fAdFlags;
|
||||||
int8 fClassID;
|
int8 fClassID;
|
||||||
bool fFrameAction;
|
int8 fFrameAction;
|
||||||
|
|
||||||
DisplayDriver *fDriver;
|
DisplayDriver *fDriver;
|
||||||
LayerData *fLayerData;
|
LayerData *fLayerData;
|
||||||
|
|||||||
Reference in New Issue
Block a user