MacDecorator :

-Draw the text in the titlebar
-Fix the buttons (they now are shaded like the DefaultDecorator one, that is, better than in original Mac OS)
-Draw the decorator all grey with no buttons when not focused
-Fix the border

There are some minor bugs left, but basically the decorator is now usable.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34760 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/decorators/MacDecorator/MacDecorator.cpp

@@ -6,6 +6,8 @@
 /*! Decorator looking like Mac OS 9 */
 
 
+#include "MacDecorator.h"
+
 #include <GradientLinear.h>
 #include <Point.h>
 #include <View.h>
@@ -15,8 +17,6 @@
 #include "PatternHandler.h"
 #include "RGBColor.h"
 
-#include "MacDecorator.h"
-
 
 //#define DEBUG_DECORATOR
 #ifdef DEBUG_DECORATOR
@@ -52,13 +52,107 @@ MacDecorator::MacDecorator(DesktopSettings& settings, BRect rect,
 
 MacDecorator::~MacDecorator()
 {
-	STRACE("~MacDecorator()\n");
+	STRACE(("~MacDecorator()\n"));
 }
 
-// settitle
+
-// fontschanged
+void
-// setlook
+MacDecorator::SetTitle(const char* string, BRegion* updateRegion)
-// setflags
+{
+	// TODO: we could be much smarter about the update region
+
+	BRect rect = TabRect();
+
+	Decorator::SetTitle(string);
+
+	if (updateRegion == NULL)
+		return;
+
+	// Decorator::SetTitle may change the TabRect, so we merge the new one
+	BRect updatedRect = TabRect();
+	if (rect.left > updatedRect.left)
+		rect.left = updatedRect.left;
+	if (rect.right < updatedRect.right)
+		rect.right = updatedRect.right;
+
+	rect.bottom++;
+		// the border will look differently when the title is adjacent
+
+	updateRegion->Include(rect);
+}
+
+
+void
+MacDecorator::FontsChanged(DesktopSettings& settings, BRegion* updateRegion)
+{
+	// get previous extent
+	if (updateRegion != NULL) {
+		BRegion extent;
+		GetFootprint(&extent);
+		updateRegion->Include(&extent);
+	}
+
+	// TODO : does this do anything usefull ?
+	// _UpdateFont(settings);
+	// _InvalidateBitmaps();
+	_DoLayout();
+
+	if (updateRegion != NULL) {
+		BRegion extent;
+		GetFootprint(&extent);
+		updateRegion->Include(&extent);
+	}
+}
+
+
+void
+MacDecorator::SetLook(DesktopSettings& settings, window_look look,
+	BRegion* updateRegion)
+{
+	// TODO: we could be much smarter about the update region
+
+	// get previous extent
+	if (updateRegion != NULL) {
+		BRegion extent;
+		GetFootprint(&extent);
+		updateRegion->Include(&extent);
+	}
+
+	fLook = look;
+
+	// _UpdateFont(settings);
+	// _InvalidateBitmaps();
+	_DoLayout();
+
+	if (updateRegion != NULL) {
+		BRegion extent;
+		GetFootprint(&extent);
+		updateRegion->Include(&extent);
+	}
+}
+
+
+void
+MacDecorator::SetFlags(uint32 flags, BRegion* updateRegion)
+{
+	// TODO: we could be much smarter about the update region
+
+	// get previous extent
+	if (updateRegion != NULL) {
+		BRegion extent;
+		GetFootprint(&extent);
+		updateRegion->Include(&extent);
+	}
+
+	Decorator::SetFlags(flags, updateRegion);
+	_DoLayout();
+
+	if (updateRegion != NULL) {
+		BRegion extent;
+		GetFootprint(&extent);
+		updateRegion->Include(&extent);
+	}
+}
 
 
 void
@@ -209,19 +303,20 @@ MacDecorator::Clicked(BPoint point, int32 buttons, int32 modifiers)
 void
 MacDecorator::_DoLayout(void)
 {
+	int32 kDefaultBorderWidth = 6;
 	STRACE(("MacDecorator: Do Layout\n"));
 
 	bool hasTab = false;
 
 	switch (Look()) {
 		case B_MODAL_WINDOW_LOOK:
-			fBorderWidth = 5;
+			fBorderWidth = kDefaultBorderWidth;
 			break;
 
 		case B_TITLED_WINDOW_LOOK:
 		case B_DOCUMENT_WINDOW_LOOK:
 			hasTab = true;
-			fBorderWidth = 5;
+			fBorderWidth = kDefaultBorderWidth;
 			break;
 		case B_FLOATING_WINDOW_LOOK:
 			hasTab = true;
@@ -238,10 +333,18 @@ MacDecorator::_DoLayout(void)
 	fBorderRect=fFrame;
 
 	if (hasTab) {
-		fBorderRect.top+=19;
+		fBorderRect.InsetBy(-kDefaultBorderWidth, -kDefaultBorderWidth);
+		fBorderRect.top +=3;
 
-		fTabRect=fFrame;
+		font_height fontHeight;
-		fTabRect.bottom=fTabRect.top+19;
+		fDrawState.Font().GetHeight(fontHeight);
+
+		// TODO the tab is drawn in a fixed height for now
+		fTabRect.Set(fFrame.left - fBorderWidth,
+			fFrame.top - 20,
+			((fFrame.right - fFrame.left) < 32.0 ?
+				fFrame.left + 32.0 : fFrame.right) + fBorderWidth,
+			fFrame.top);
 
 		fZoomRect=fTabRect;
 		fZoomRect.left=fZoomRect.right-12;
@@ -295,10 +398,9 @@ MacDecorator::_DrawFrame(BRect invalid)
 		case B_DOCUMENT_WINDOW_LOOK:
 		case B_MODAL_WINDOW_LOOK:
 		{
-			BPoint offset,pt2,topleftpt,toprightpt;
+			if (IsFocus()) {
-
+				BPoint offset = r.LeftTop();
-			offset=r.LeftTop();
+				BPoint pt2 = r.LeftBottom();
-			pt2=r.LeftBottom();
 
 				// Draw the left side of the frame
 				fDrawingEngine->StrokeLine(offset,pt2,frame_lowercol);
@@ -322,7 +424,7 @@ MacDecorator::_DrawFrame(BRect invalid)
 				fDrawingEngine->StrokeLine(offset,pt2,frame_lowcol);
 				offset.x++;
 				offset.y+=2;
-			topleftpt=offset;
+				BPoint topleftpt=offset;
 				pt2.x++;
 				pt2.y--;
 
@@ -351,12 +453,15 @@ MacDecorator::_DrawFrame(BRect invalid)
 				fDrawingEngine->StrokeLine(offset,pt2,frame_highcol);
 				offset.x--;
 				offset.y+=2;
-			toprightpt=offset;
+				BPoint toprightpt=offset;
 				pt2.x--;
 
 				fDrawingEngine->StrokeLine(offset,pt2,frame_lowercol);
 
 				// Draw the top side of the frame that is not in the tab
+				offset=r.RightTop();
+				pt2=r.RightBottom();
+
 				fDrawingEngine->StrokeLine(topleftpt,toprightpt,frame_lowercol);
 				topleftpt.y--;
 				toprightpt.x++;
@@ -364,10 +469,6 @@ MacDecorator::_DrawFrame(BRect invalid)
 
 				fDrawingEngine->StrokeLine(topleftpt,toprightpt,frame_lowcol);
 
-			offset=r.RightTop();
-			pt2=r.RightBottom();
-
-
 				offset=r.LeftBottom();
 				pt2=r.RightBottom();
 
@@ -406,6 +507,24 @@ MacDecorator::_DrawFrame(BRect invalid)
 				offset.y--;
 				pt2.x--;
 				pt2.y--;
+			} else {
+				fDrawingEngine->StrokeLine(r.LeftTop(), r.LeftBottom(), frame_lowcol);
+				fDrawingEngine->StrokeLine(r.RightTop(), r.RightBottom(), frame_lowcol);
+				fDrawingEngine->StrokeLine(r.LeftBottom(), r.RightBottom(), frame_lowcol);
+
+				for (int i = 0; i < 4; i++) {
+					r.InsetBy(1, 1);
+					fDrawingEngine->StrokeLine(r.LeftTop(), r.LeftBottom(), frame_midcol);
+					fDrawingEngine->StrokeLine(r.RightTop(), r.RightBottom(), frame_midcol);
+					fDrawingEngine->StrokeLine(r.LeftBottom(), r.RightBottom(), frame_midcol);
+				}
+
+				r.InsetBy(1, 1);
+				fDrawingEngine->StrokeLine(r.LeftTop(), r.LeftBottom(), frame_lowcol);
+				fDrawingEngine->StrokeLine(r.RightTop(), r.RightBottom(), frame_lowcol);
+				fDrawingEngine->StrokeLine(r.LeftBottom(), r.RightBottom(), frame_lowcol);
+			}
+			break;
 		}
 		case B_BORDERED_WINDOW_LOOK:
 		fDrawingEngine->StrokeRect(r, frame_midcol);
@@ -426,16 +545,12 @@ MacDecorator::_DrawTab(BRect invalid)
 	if (!fTabRect.IsValid() || !invalid.Intersects(fTabRect))
 		return;
 
-//	fDrawState.SetHighColor(frame_lowcol);
-//	fDrawingEngine->StrokeRect(fTabRect,fDrawState.HighColor());
-
-//	UpdateTitle(layer->name->String());
 	BRect rect(fTabRect);
-	fDrawState.SetHighColor(RGBColor(frame_midcol));
+	fDrawingEngine->SetHighColor(RGBColor(frame_midcol));
 	fDrawingEngine->FillRect(rect,frame_midcol);
 
 
-	//if(IsFocus())
+	if(IsFocus())
 	{
 		fDrawingEngine->StrokeLine(rect.LeftTop(),rect.RightTop(),frame_lowercol);
 		fDrawingEngine->StrokeLine(rect.LeftTop(),rect.LeftBottom(),frame_lowercol);
@@ -498,13 +613,20 @@ MacDecorator::_DrawTab(BRect invalid)
 			}
 		}
 
+
 		// Draw the buttons if we're supposed to	
 		if(!(fFlags & B_NOT_CLOSABLE))
 			_DrawClose(fCloseRect);
 		if(!(fFlags & B_NOT_ZOOMABLE))
 			_DrawZoom(fZoomRect);
+	} else {
+		// Not focused - Just draw a plain light grey area with the title in the middle
+		fDrawingEngine->StrokeLine(rect.LeftTop(),rect.RightTop(),frame_lowcol);
+		fDrawingEngine->StrokeLine(rect.LeftTop(),rect.LeftBottom(),frame_lowcol);
+		fDrawingEngine->StrokeLine(rect.RightBottom(),rect.RightTop(),frame_lowcol);
 	}
 
+	_DrawTitle(fTabRect);
 }
 
 
@@ -518,58 +640,57 @@ MacDecorator::_DrawClose(BRect r)
 
 	BPoint offset(r.LeftTop()),pt2(r.RightTop());
 
+	// Topleft dark grey border
 	pt2.x--;
-	fDrawState.SetHighColor(RGBColor(136,136,136));
+	fDrawingEngine->SetHighColor(RGBColor(136,136,136));
-	fDrawingEngine->StrokeLine(offset,pt2,fDrawState.HighColor());
+	fDrawingEngine->StrokeLine(offset,pt2);
 
 	pt2=r.LeftBottom();
 	pt2.y--;
-	fDrawingEngine->StrokeLine(offset,pt2,fDrawState.HighColor());
+	fDrawingEngine->StrokeLine(offset,pt2);
 
+	// Bottomright white border
 	offset=r.RightBottom();
 	pt2=r.RightTop();
 	pt2.y++;
-	fDrawState.SetHighColor(RGBColor(255,255,255));
+	fDrawingEngine->SetHighColor(RGBColor(255,255,255));
-	fDrawingEngine->StrokeLine(offset,pt2,fDrawState.HighColor());
+	fDrawingEngine->StrokeLine(offset,pt2);
 
 	pt2=r.LeftBottom();
 	pt2.x++;
-	fDrawingEngine->StrokeLine(offset,pt2,fDrawState.HighColor());
+	fDrawingEngine->StrokeLine(offset,pt2);
 
+	// Black outline
 	rect.InsetBy(1,1);
-	fDrawState.SetHighColor(RGBColor(0,0,0));
+	fDrawingEngine->SetHighColor(RGBColor(0,0,0));
-	fDrawingEngine->StrokeRect(rect,fDrawState.HighColor());
+	fDrawingEngine->StrokeRect(rect);
 
+	// Double-shaded button
 	rect.InsetBy(1,1);
 	_DrawBlendedRect(fDrawingEngine, rect, down);
 	rect.InsetBy(1,1);
 	_DrawBlendedRect(fDrawingEngine, rect, !down);
-	
-//	rect.top+=4;
-//	rect.left++;
-//	rect.right--;
-	
-//	fDrawState.SetHighColor(RGBColor(0,0,0));
-//	fDrawingEngine->StrokeLine(rect.LeftTop(),rect.RightTop(),&fDrawState,pat_solidhigh);
 }
 
 
-void MacDecorator::_DrawTitle(BRect r)
+	void
+MacDecorator::_DrawTitle(BRect rect)
 {
 	if(IsFocus())
-		fDrawState.SetHighColor(fFocusTextColor);
+		fDrawingEngine->SetHighColor(fFocusTextColor);
 	else
-		fDrawState.SetHighColor(fNonFocusTextColor);
+		fDrawingEngine->SetHighColor(fNonFocusTextColor);
 
-	fDrawState.SetLowColor(frame_midcol);
+	fDrawingEngine->SetLowColor(frame_midcol);
 
 	fTruncatedTitle = Title();
 	fDrawState.Font().TruncateString(&fTruncatedTitle, B_TRUNCATE_END,
 			(fZoomRect.left - 5) - (fCloseRect.right + 5));
 	fTruncatedTitleLength = fTruncatedTitle.Length();
+	fDrawingEngine->SetFont(fDrawState.Font());
 
 	fDrawingEngine->DrawString(fTruncatedTitle,fTruncatedTitleLength,
-		BPoint(fTabRect.left+textoffset,fCloseRect.bottom-1)/*,&fDrawState*/);
+			BPoint(fTabRect.left+textoffset,fCloseRect.bottom-1));
 }
 
 
@@ -663,7 +784,29 @@ void MacDecorator::_DrawMinimize(BRect r)
 }
 
 
-/*!	\brief Draws a framed rectangle with a gradient.
+	void
+MacDecorator::_SetColors()
+{
+	_SetFocus();
+}
+
+
+	void
+MacDecorator::_UpdateFont(DesktopSettings& settings)
+{
+	ServerFont font;
+	if (fLook == B_FLOATING_WINDOW_LOOK) {
+		settings.GetDefaultPlainFont(font);
+	} else
+		settings.GetDefaultBoldFont(font);
+
+	font.SetFlags(B_FORCE_ANTIALIASING);
+	font.SetSpacing(B_STRING_SPACING);
+	fDrawState.SetFont(font);
+}
+
+
+/*!	\brief Draws a rectangle with a gradient.
   \param down The rectangle should be drawn recessed or not
   */
 	void
@@ -673,15 +816,14 @@ MacDecorator::_DrawBlendedRect(DrawingEngine* engine, BRect rect,
 	// figure out which colors to use
 	rgb_color startColor, endColor;
 	if (down) {
-		startColor = tint_color(fButtonLowColor, B_DARKEN_1_TINT);
+		startColor = fButtonLowColor;
-		endColor = fButtonLowColor;
+		endColor = frame_highcol;
 	} else {
-		startColor = tint_color(fButtonHighColor, B_LIGHTEN_MAX_TINT);
+		startColor = fButtonHighColor;
-		endColor = fButtonHighColor;
+		endColor = frame_lowercol;
 	}
 
 	// fill
-	rect.InsetBy(1, 1);
 	BGradientLinear gradient;
 	gradient.SetStart(rect.LeftTop());
 	gradient.SetEnd(rect.RightBottom());
@@ -689,20 +831,9 @@ MacDecorator::_DrawBlendedRect(DrawingEngine* engine, BRect rect,
 	gradient.AddColor(endColor, 255);
 
 	engine->FillRect(rect, gradient);
-
-	// outline
-	rect.InsetBy(-1, -1);
-	engine->StrokeRect(rect, tint_color(fTabColor, B_DARKEN_2_TINT));
 }
 
 
-/*
-void MacDecorator::_SetColors(void)
-{
-	_SetFocus();
-}
-*/
-
 extern "C" float get_decorator_version(void)
 {
 	return 1.00;

src/add-ons/decorators/MacDecorator/MacDecorator.h

@@ -19,14 +19,14 @@ public:
 									uint32 flags);
 								~MacDecorator();
 
-	//		void				SetTitle(const char* string,
+			void				SetTitle(const char* string,
-	// 								BRegion* updateRegion = NULL);
+	 								BRegion* updateRegion = NULL);
-	//		void				FontsChanged(DesktopSettings& settings,
+			void				FontsChanged(DesktopSettings& settings,
-	//								BRegion* updateRegion);
+									BRegion* updateRegion);
-	// 		void				SetLook(DesktopSettings& settings,
+	 		void				SetLook(DesktopSettings& settings, window_look look,
-	//								BRegion* updateRegion = NULL);
+									BRegion* updateRegion = NULL);
-	// 		void				SetFlags(uint32 flags,
+	 		void				SetFlags(uint32 flags,
-	//								BRegion* updateRegion = NULL);
+									BRegion* updateRegion = NULL);
 	
 			void				MoveBy(BPoint offset);
 			void 				ResizeBy(BPoint offset, BRegion* dirty);
@@ -59,20 +59,21 @@ protected:
 			void				_DrawMinimize(BRect r);
 
 		// 	void				_SetFocus();
-		//	void				_SetColors();
+			void				_SetColors();
 private:
+			void				_UpdateFont(DesktopSettings& settings);
 			void				_DrawBlendedRect(DrawingEngine* engine,
 									BRect r, bool down);
 
 			rgb_color			fButtonHighColor;
 			rgb_color			fButtonLowColor;
-			rgb_color			fTabColor;
 			rgb_color			frame_highcol;
 			rgb_color			frame_midcol;
 			rgb_color			frame_lowcol;
 			rgb_color			frame_lowercol;
 			rgb_color			fFocusTextColor;
 			rgb_color			fNonFocusTextColor;
+
 			uint64 solidhigh, solidlow;
 
 			BString				fTruncatedTitle;