Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WindDecorator and MacDecorator compile again

Browse Source 
* Tile works, Stack is not very usefull at the moment.
* MacDecorator minimize button doesn't work.
This commit is contained in:
Janus 2016-11-16 10:28:42 +01:00
parent 7f07c303ab
commit a55deaea91
6 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/add-ons/decorators/MacDecorator/Jamfile
View File

@ -2,6 +2,7 @@ SubDir HAIKU_TOP src add-ons decorators MacDecorator ;
UseBuildFeatureHeaders freetype ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app stackandtile ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;

10
src/add-ons/decorators/MacDecorator/MacDecorator.cpp
View File

@ -43,15 +43,17 @@ MacDecorAddOn::MacDecorAddOn(image_id id, const char* name)
Decorator*
MacDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect)
MacDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect,
Desktop* desktop)
{
return new (std::nothrow)MacDecorator(settings, rect);
return new (std::nothrow)MacDecorator(settings, rect, desktop);
}
MacDecorator::MacDecorator(DesktopSettings& settings, BRect frame)
MacDecorator::MacDecorator(DesktopSettings& settings, BRect frame,
Desktop* desktop)
:
Decorator(settings, frame),
SATDecorator(settings, frame, desktop),
fButtonHighColor((rgb_color) { 232, 232, 232, 255 }),
fButtonLowColor((rgb_color) { 128, 128, 128, 255 }),
fFrameHighColor((rgb_color) { 255, 255, 255, 255 }),

7
src/add-ons/decorators/MacDecorator/MacDecorator.h
View File

@ -13,6 +13,7 @@
#include "DecorManager.h"
#include "RGBColor.h"
#include "SATDecorator.h"
class MacDecorAddOn : public DecorAddOn {
@ -21,14 +22,14 @@ public:
protected:
virtual Decorator* _AllocateDecorator(DesktopSettings& settings,
BRect rect);
BRect rect, Desktop* desktop);
};
class MacDecorator: public Decorator {
class MacDecorator: public SATDecorator {
public:
MacDecorator(DesktopSettings& settings,
BRect frame);
BRect frame, Desktop* desktop);
virtual ~MacDecorator();
void Draw(BRect updateRect);

1
src/add-ons/decorators/WinDecorator/Jamfile
View File

@ -2,6 +2,7 @@ SubDir HAIKU_TOP src add-ons decorators WinDecorator ;
UseBuildFeatureHeaders freetype ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app stackandtile ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app decorator ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing ] ;
UseHeaders [ FDirName $(HAIKU_TOP) src servers app drawing Painter ] ;

10
src/add-ons/decorators/WinDecorator/WinDecorator.cpp
View File

@ -43,15 +43,17 @@ WinDecorAddOn::WinDecorAddOn(image_id id, const char* name)
Decorator*
WinDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect)
WinDecorAddOn::_AllocateDecorator(DesktopSettings& settings, BRect rect,
Desktop* desktop)
{
return new (std::nothrow)WinDecorator(settings, rect);
return new (std::nothrow)WinDecorator(settings, rect, desktop);
}
WinDecorator::WinDecorator(DesktopSettings& settings, BRect frame)
WinDecorator::WinDecorator(DesktopSettings& settings, BRect frame,
Desktop* desktop)
:
Decorator(settings, frame),
SATDecorator(settings, frame, desktop),
// common colors to both focus and non focus state
fFrameHighColor((rgb_color){ 255, 255, 255, 255 }),
fFrameMidColor((rgb_color){ 216, 216, 216, 255 }),

8
src/add-ons/decorators/WinDecorator/WinDecorator.h
View File

@ -11,8 +11,8 @@
#define WIN_DECORATOR_H
#include "Decorator.h"
#include "DecorManager.h"
#include "SATDecorator.h"
struct rgb_color;
@ -26,14 +26,14 @@ public:
protected:
virtual Decorator* _AllocateDecorator(DesktopSettings& settings,
BRect rect);
BRect rect, Desktop* desktop);
};
class WinDecorator: public Decorator {
class WinDecorator: public SATDecorator {
public:
WinDecorator(DesktopSettings& settings,
BRect frame);
BRect frame, Desktop* desktop);
~WinDecorator(void);
virtual void Draw(BRect updateRect);