Set look and flags at the correct position.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37609 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
30c31ae28a
commit
604ae84e46
@ -99,8 +99,6 @@ Decorator::SetFlags(uint32 flags, BRegion* updateRegion)
|
|||||||
if (flags & B_NOT_RESIZABLE)
|
if (flags & B_NOT_RESIZABLE)
|
||||||
flags |= B_NOT_H_RESIZABLE | B_NOT_V_RESIZABLE;
|
flags |= B_NOT_H_RESIZABLE | B_NOT_V_RESIZABLE;
|
||||||
|
|
||||||
fFlags = flags;
|
|
||||||
|
|
||||||
fFootprintValid = false;
|
fFootprintValid = false;
|
||||||
// the border might have changed (smaller/larger tab)
|
// the border might have changed (smaller/larger tab)
|
||||||
_SetFlags(flags, updateRegion);
|
_SetFlags(flags, updateRegion);
|
||||||
@ -124,8 +122,6 @@ void
|
|||||||
Decorator::SetLook(DesktopSettings& settings, window_look look,
|
Decorator::SetLook(DesktopSettings& settings, window_look look,
|
||||||
BRegion* updateRect)
|
BRegion* updateRect)
|
||||||
{
|
{
|
||||||
fLook = look;
|
|
||||||
|
|
||||||
fFootprintValid = false;
|
fFootprintValid = false;
|
||||||
// the border very likely changed
|
// the border very likely changed
|
||||||
_SetLook(settings, look, updateRect);
|
_SetLook(settings, look, updateRect);
|
||||||
@ -628,12 +624,14 @@ void
|
|||||||
Decorator::_SetLook(DesktopSettings& settings, window_look look,
|
Decorator::_SetLook(DesktopSettings& settings, window_look look,
|
||||||
BRegion* updateRect)
|
BRegion* updateRect)
|
||||||
{
|
{
|
||||||
|
fLook = look;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
void
|
||||||
Decorator::_SetFlags(uint32 flags, BRegion* updateRegion)
|
Decorator::_SetFlags(uint32 flags, BRegion* updateRegion)
|
||||||
{
|
{
|
||||||
|
fFlags = flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -790,6 +790,8 @@ DefaultDecorator::_SetLook(DesktopSettings& settings, window_look look,
|
|||||||
if (updateRegion != NULL)
|
if (updateRegion != NULL)
|
||||||
updateRegion->Include(&GetFootprint());
|
updateRegion->Include(&GetFootprint());
|
||||||
|
|
||||||
|
fLook = look;
|
||||||
|
|
||||||
_UpdateFont(settings);
|
_UpdateFont(settings);
|
||||||
_InvalidateBitmaps();
|
_InvalidateBitmaps();
|
||||||
_DoLayout();
|
_DoLayout();
|
||||||
@ -808,6 +810,7 @@ DefaultDecorator::_SetFlags(uint32 flags, BRegion* updateRegion)
|
|||||||
if (updateRegion != NULL)
|
if (updateRegion != NULL)
|
||||||
updateRegion->Include(&GetFootprint());
|
updateRegion->Include(&GetFootprint());
|
||||||
|
|
||||||
|
fFlags = flags;
|
||||||
_DoLayout();
|
_DoLayout();
|
||||||
|
|
||||||
if (updateRegion != NULL)
|
if (updateRegion != NULL)
|
||||||
|
Loading…
Reference in New Issue
Block a user