[haiku-commits] r37609 - haiku/trunk/src/servers/app

Author: czeidler
Date: 2010-07-20 03:46:58 +0200 (Tue, 20 Jul 2010)
New Revision: 37609
Changeset: http://dev.haiku-os.org/changeset/37609

Modified:
   haiku/trunk/src/servers/app/Decorator.cpp
   haiku/trunk/src/servers/app/DefaultDecorator.cpp
Log:
Set look and flags at the correct position.



Modified: haiku/trunk/src/servers/app/Decorator.cpp
===================================================================
--- haiku/trunk/src/servers/app/Decorator.cpp   2010-07-20 00:58:11 UTC (rev 
37608)
+++ haiku/trunk/src/servers/app/Decorator.cpp   2010-07-20 01:46:58 UTC (rev 
37609)
@@ -99,8 +99,6 @@
        if (flags & B_NOT_RESIZABLE)
                flags |= B_NOT_H_RESIZABLE | B_NOT_V_RESIZABLE;
 
-       fFlags = flags;
-
        fFootprintValid = false;
                // the border might have changed (smaller/larger tab)
        _SetFlags(flags, updateRegion);
@@ -124,8 +122,6 @@
 Decorator::SetLook(DesktopSettings& settings, window_look look,
        BRegion* updateRect)
 {
-       fLook = look;
-
        fFootprintValid = false;
                // the border very likely changed
        _SetLook(settings, look, updateRect);
@@ -628,12 +624,14 @@
 Decorator::_SetLook(DesktopSettings& settings, window_look look,
        BRegion* updateRect)
 {
+       fLook = look;
 }
 
 
 void
 Decorator::_SetFlags(uint32 flags, BRegion* updateRegion)
 {
+       fFlags = flags;
 }
 
 

Modified: haiku/trunk/src/servers/app/DefaultDecorator.cpp
===================================================================
--- haiku/trunk/src/servers/app/DefaultDecorator.cpp    2010-07-20 00:58:11 UTC 
(rev 37608)
+++ haiku/trunk/src/servers/app/DefaultDecorator.cpp    2010-07-20 01:46:58 UTC 
(rev 37609)
@@ -790,6 +790,8 @@
        if (updateRegion != NULL)
                updateRegion->Include(&GetFootprint());
 
+       fLook = look;
+
        _UpdateFont(settings);
        _InvalidateBitmaps();
        _DoLayout();
@@ -808,6 +810,7 @@
        if (updateRegion != NULL)
                updateRegion->Include(&GetFootprint());
 
+       fFlags = flags;
        _DoLayout();
 
        if (updateRegion != NULL)

Other related posts:

  • » [haiku-commits] r37609 - haiku/trunk/src/servers/app - clemens . zeidler