From 6b585e268a40f2f6cea18886cd9e844d8a0d8434 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Mon, 29 Jul 2013 19:34:08 -0400 Subject: [PATCH] Fix _SetLook() and _SetFlags() methods --- src/add-ons/decorators/WinDecorator/WinDecorator.cpp | 10 +++++++--- src/add-ons/decorators/WinDecorator/WinDecorator.h | 7 +++---- src/servers/app/decorator/Decorator.h | 5 ++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/add-ons/decorators/WinDecorator/WinDecorator.cpp b/src/add-ons/decorators/WinDecorator/WinDecorator.cpp index 7bc4cd09a5..a5521dd04b 100644 --- a/src/add-ons/decorators/WinDecorator/WinDecorator.cpp +++ b/src/add-ons/decorators/WinDecorator/WinDecorator.cpp @@ -431,9 +431,11 @@ WinDecorator::_FontsChanged(DesktopSettings& settings, void -WinDecorator::_SetLook(DesktopSettings& settings, window_look look, - BRegion* updateRegion) +WinDecorator::_SetLook(Decorator::Tab* tab, DesktopSettings& settings, + window_look look, BRegion* updateRegion) { + tab->look = look; + // TODO we could be much smarter about the update region // get previous extent @@ -452,8 +454,10 @@ WinDecorator::_SetLook(DesktopSettings& settings, window_look look, void -WinDecorator::_SetFlags(uint32 flags, BRegion* updateRegion) +WinDecorator::_SetFlags(Decorator::Tab* tab, uint32 flags, BRegion* updateRegion) { + tab->flags = flags; + // TODO we could be much smarter about the update region // get previous extent diff --git a/src/add-ons/decorators/WinDecorator/WinDecorator.h b/src/add-ons/decorators/WinDecorator/WinDecorator.h index 8654210462..3086ee663f 100644 --- a/src/add-ons/decorators/WinDecorator/WinDecorator.h +++ b/src/add-ons/decorators/WinDecorator/WinDecorator.h @@ -60,10 +60,9 @@ protected: void _FontsChanged(DesktopSettings& settings, BRegion* updateRegion); - void _SetLook(DesktopSettings& settings, - window_look look, - BRegion* updateRegion = NULL); - void _SetFlags(uint32 flags, + void _SetLook(Decorator::Tab* tab, DesktopSettings& settings, + window_look look, BRegion* updateRegion = NULL); + void _SetFlags(Decorator::Tab* tab, uint32 flags, BRegion* updateRegion = NULL); void _MoveBy(BPoint offset); diff --git a/src/servers/app/decorator/Decorator.h b/src/servers/app/decorator/Decorator.h index 20df2f4b89..3c29cc63a8 100644 --- a/src/servers/app/decorator/Decorator.h +++ b/src/servers/app/decorator/Decorator.h @@ -197,9 +197,8 @@ protected: virtual void _FontsChanged(DesktopSettings& settings, BRegion* updateRegion = NULL); - virtual void _SetLook(Decorator::Tab* tab, - DesktopSettings& settings, window_look look, - BRegion* updateRegion = NULL); + virtual void _SetLook(Decorator::Tab* tab, DesktopSettings& settings, + window_look look, BRegion* updateRegion = NULL); virtual void _SetFlags(Decorator::Tab* tab, uint32 flags, BRegion* updateRegion = NULL);