* Header cleanup.

* Removed dead code which was for drawing a BButton like R5.


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

headers/os/interface/Button.h

@@ -1,136 +1,98 @@
-//------------------------------------------------------------------------------
+/*
-//	Copyright (c) 2001-2002, OpenBeOS
+ * Copyright 2001-2009 Haiku Inc. All rights reserved.
-//
+ * Distributed under the terms of the MIT license.
-//	Permission is hereby granted, free of charge, to any person obtaining a
+ *
-//	copy of this software and associated documentation files (the "Software"),
+ * Authors:
-//	to deal in the Software without restriction, including without limitation
+ *		Marc Flerackers <[email protected]>
-//	the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ *		Stephan Aßmus <[email protected]>
-//	and/or sell copies of the Software, and to permit persons to whom the
+ */
-//	Software is furnished to do so, subject to the following conditions:
-//
-//	The above copyright notice and this permission notice shall be included in
-//	all copies or substantial portions of the Software.
-//
-//	THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-//	IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-//	FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-//	AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-//	LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-//	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-//	DEALINGS IN THE SOFTWARE.
-//
-//	File Name:		Button.h
-//	Author:			Marc Flerackers ([email protected])
-//	Description:	BButton displays and controls a button in a window.
-//------------------------------------------------------------------------------
-
 #ifndef _BUTTON_H
 #define _BUTTON_H
 
-// Standard Includes -----------------------------------------------------------
-
-// System Includes -------------------------------------------------------------
 #include <BeBuild.h>
 #include <Control.h>
 
-// Project Includes ------------------------------------------------------------
 
-// Local Includes --------------------------------------------------------------
-
-// Local Defines ---------------------------------------------------------------
-
-// Globals ---------------------------------------------------------------------
-
-
-// BButton class ---------------------------------------------------------------
 class BButton : public BControl {
-
 public:
-					BButton(BRect frame,
+								BButton(BRect frame, const char* name,
-							const char *name,
+									const char* label, BMessage* message,
-							const char *label,
+									uint32 resizingMode
-							BMessage *message,
+										= B_FOLLOW_LEFT | B_FOLLOW_TOP,
-							uint32 resizingMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
+									uint32 flags = B_WILL_DRAW | B_NAVIGABLE
-							uint32 flags = B_WILL_DRAW | B_NAVIGABLE
+										| B_FULL_UPDATE_ON_RESIZE); 
-								| B_FULL_UPDATE_ON_RESIZE); 
+								BButton(const char* name, const char* label,
-					BButton(const char* name, const char* label,
+									BMessage *message,
-							BMessage *message,
+									uint32 flags = B_WILL_DRAW | B_NAVIGABLE
-							uint32 flags = B_WILL_DRAW | B_NAVIGABLE
+										| B_FULL_UPDATE_ON_RESIZE);
-								| B_FULL_UPDATE_ON_RESIZE);
+								BButton(const char* label,
-					BButton(const char* label, BMessage *message = NULL);
+									BMessage* message = NULL);
 	
-virtual				~BButton();
+								BButton(BMessage *archive);
 
-					BButton(BMessage *archive);
+	virtual						~BButton();
 
-static BArchivable	*Instantiate(BMessage *archive);
+	static	BArchivable*		Instantiate(BMessage* archive);
-virtual	status_t	Archive (BMessage *archive, bool deep = true) const;
+	virtual	status_t			Archive(BMessage* archive,
+									bool deep = true) const;
 	
-virtual void		Draw(BRect updateRect);
+	virtual	void				Draw(BRect updateRect);
-virtual void		MouseDown(BPoint point);
+	virtual	void				MouseDown(BPoint point);
-virtual void		AttachedToWindow();
+	virtual	void				AttachedToWindow();
-virtual void		KeyDown(const char *bytes, int32 numBytes);
+	virtual	void				KeyDown(const char* bytes, int32 numBytes);
-virtual void		MakeDefault(bool flag);
+	virtual	void				MakeDefault(bool flag);
-virtual void		SetLabel(const char *string);
+	virtual	void				SetLabel(const char* string);
-		bool		IsDefault() const;
+			bool				IsDefault() const;
 
-virtual void		MessageReceived(BMessage *message);
+	virtual	void				MessageReceived(BMessage* message);
-virtual void		WindowActivated(bool active);
+	virtual	void				WindowActivated(bool active);
-virtual void		MouseMoved(BPoint point, uint32 transit, const BMessage *message);
+	virtual	void				MouseMoved(BPoint point, uint32 transit,
-virtual void		MouseUp(BPoint point);
+									const BMessage* message);
-virtual	void		DetachedFromWindow();
+	virtual	void				MouseUp(BPoint point);
-virtual	void		SetValue(int32 value);
+	virtual	void				DetachedFromWindow();
-virtual void		GetPreferredSize (float *width, float *height);
+	virtual	void				SetValue(int32 value);
-virtual void		ResizeToPreferred();
+	virtual	void				GetPreferredSize (float* _width,
-virtual	status_t	Invoke(BMessage *message = NULL);
+									float* _height);
-virtual	void		FrameMoved(BPoint newLocation);
+	virtual	void				ResizeToPreferred();
-virtual	void		FrameResized(float width, float height);
+	virtual	status_t			Invoke(BMessage* message = NULL);
+	virtual	void				FrameMoved(BPoint newLocation);
+	virtual	void				FrameResized(float width, float height);
 
-virtual void		MakeFocus(bool focused = true);
+	virtual	void				MakeFocus(bool focused = true);
-virtual void		AllAttached();
+	virtual	void				AllAttached();
-virtual void		AllDetached();
+	virtual	void				AllDetached();
 	
-virtual BHandler	*ResolveSpecifier(BMessage *message,
+	virtual	BHandler*			ResolveSpecifier(BMessage* message,
-									int32 index,
+									int32 index, BMessage* specifier,
-									BMessage *specifier,
+									int32 what, const char* property);
-									int32 what,
+	virtual	status_t			GetSupportedSuites(BMessage* message);
-									const char *property);
+	virtual	status_t			Perform(perform_code d, void* arg);
-virtual	status_t	GetSupportedSuites(BMessage *message);
-virtual status_t	Perform(perform_code d, void *arg);
 
-virtual	void		InvalidateLayout(bool descendants = false);
+	virtual	void				InvalidateLayout(bool descendants = false);
 
-virtual	BSize		MinSize();
+	virtual	BSize				MinSize();
-virtual	BSize		MaxSize();
+	virtual	BSize				MaxSize();
-virtual	BSize		PreferredSize();
+	virtual	BSize				PreferredSize();
 
 
 private:
-		BSize		_ValidatePreferredSize();
+	virtual	void				_ReservedButton1();
+	virtual	void				_ReservedButton2();
+	virtual	void				_ReservedButton3();
 
-virtual	void		_ReservedButton1();
+private:
-virtual	void		_ReservedButton2();
+			BButton&			operator=(const BButton &);
-virtual	void		_ReservedButton3();
 
-		BButton		&operator=(const BButton &);
+			BSize				_ValidatePreferredSize();
 	
-		BRect		DrawDefault(BRect bounds, bool enabled);
+			BRect				_DrawDefault(BRect bounds, bool enabled);
-		void 		DrawFocusLine(float x, float y, float width, 
+			void 				_DrawFocusLine(float x, float y, float width, 
-			bool bVisible);
+									bool bVisible);
 			 
-		status_t	Execute ();
+			BSize				fPreferredSize;
+			bool				fDrawAsDefault;
 
-		BSize		fPreferredSize;
+			uint32				_reserved[2];
-		bool		fDrawAsDefault;
-		uint32		_reserved[2];
 };
-//------------------------------------------------------------------------------
 
 #endif // _BUTTON_H
-
-/*
- * $Log $
- *
- * $Id  $
- *
- */

src/kits/interface/Button.cpp

@@ -1,5 +1,5 @@
 /*
- *	Copyright 2001-2008, Haiku.
+ *	Copyright 2001-2008, Haiku Inc. All rights reserved.
  *  Distributed under the terms of the MIT License.
  *
  *	Authors:
@@ -7,7 +7,7 @@
  *		Mike Wilber
  *		Stefano Ceccherini ([email protected])
  *		Ivan Tonizza
- *		Stephan Aßmus, <[email protected]>
+ *		Stephan Aßmus <[email protected]>
  */
 
 
@@ -129,132 +129,9 @@ BButton::Draw(BRect updateRect)
 
 	const bool enabled = IsEnabled();
 	const bool pushed = Value() == B_CONTROL_ON;
-#if 0
 	// Default indicator
 	if (IsDefault())
-		rect = DrawDefault(rect, enabled);
+		rect = _DrawDefault(rect, enabled);
-	else
-		rect.InsetBy(1.0f, 1.0f);
-
-	BRect fillArea = rect;
-	fillArea.InsetBy(3.0f, 3.0f);
-
-	BString text = Label();
-
-#if 1
-	// Label truncation
-	BFont font;
-	GetFont(&font);
-	font.TruncateString(&text, B_TRUNCATE_END, fillArea.Width());
-#endif
-
-	// Label position
-	const float stringWidth = StringWidth(text.String());
-	const float x = (bounds.right - stringWidth) / 2.0f;
-	const float labelY = bounds.top
-		+ ((bounds.Height() - fh.ascent - fh.descent) / 2.0f)
-		+ fh.ascent +  1.0f;
-	const float focusLineY = labelY + fh.descent;
-
-	/* speed trick:
-	   if the focus changes but the button is not pressed then we can
-	   redraw only the focus line,
-	   if the focus changes and the button is pressed invert the internal rect
-	   this block takes care of all the focus changes
-	*/
-	if (IsFocusChanging()) {
-		if (pushed) {
-			rect.InsetBy(2.0, 2.0);
-			InvertRect(rect);
-		} else
-			DrawFocusLine(x, focusLineY, stringWidth, IsFocus() && Window()->IsActive());
-
-		return;
-	}
-
-	// Colors
-	const rgb_color panelBgColor = ui_color(B_PANEL_BACKGROUND_COLOR);
-	const rgb_color buttonBgColor=tint_color(panelBgColor, B_LIGHTEN_1_TINT);
-	const rgb_color maxLightColor=tint_color(panelBgColor, B_LIGHTEN_MAX_TINT);
-	const rgb_color maxShadowColor=tint_color(panelBgColor, B_DARKEN_MAX_TINT);
-	const rgb_color darkBorderColor = tint_color(panelBgColor,
-		enabled ? B_DARKEN_4_TINT : B_DARKEN_2_TINT);
-	const rgb_color firstBevelColor = enabled ? tint_color(panelBgColor, B_DARKEN_2_TINT)
-		: panelBgColor;
-	const rgb_color cornerColor = IsDefault() ? firstBevelColor : panelBgColor;
-
-	// Fill the button area
-	SetHighColor(buttonBgColor);
-	FillRect(fillArea);
-
-	// external border
-	SetHighColor(darkBorderColor);
-	StrokeRect(rect);
-
-	BeginLineArray(14);
-
-	// Corners
-	AddLine(rect.LeftTop(), rect.LeftTop(), cornerColor);
-	AddLine(rect.LeftBottom(), rect.LeftBottom(), cornerColor);
-	AddLine(rect.RightTop(), rect.RightTop(), cornerColor);
-	AddLine(rect.RightBottom(), rect.RightBottom(), cornerColor);
-
-	rect.InsetBy(1.0f,1.0f);
-
-	// Shadow
-	AddLine(rect.LeftBottom(), rect.RightBottom(), firstBevelColor);
-	AddLine(rect.RightBottom(), rect.RightTop(), firstBevelColor);
-	// Light
-	AddLine(rect.LeftTop(), rect.LeftBottom(),buttonBgColor);
-	AddLine(rect.LeftTop(), rect.RightTop(), buttonBgColor);
-
-	rect.InsetBy(1.0f, 1.0f);
-
-	// Shadow
-	AddLine(rect.LeftBottom(), rect.RightBottom(), panelBgColor);
-	AddLine(rect.RightBottom(), rect.RightTop(), panelBgColor);
-	// Light
-	AddLine(rect.LeftTop(), rect.LeftBottom(),maxLightColor);
-	AddLine(rect.LeftTop(), rect.RightTop(), maxLightColor);
-
-	rect.InsetBy(1.0f,1.0f);
-
-	// Light
-	AddLine(rect.LeftTop(), rect.LeftBottom(),maxLightColor);
-	AddLine(rect.LeftTop(), rect.RightTop(), maxLightColor);
-
-	EndLineArray();
-
-	// Invert if clicked
-	if (enabled && pushed) {
-		rect.InsetBy(-2.0f, -2.0f);
-		InvertRect(rect);
-	}
-
-	// Label color
-	if (enabled) {
-		if (pushed) {
-			SetHighColor(maxLightColor);
-			SetLowColor(maxShadowColor);
-		} else {
-			SetHighColor(maxShadowColor);
-			SetLowColor(tint_color(panelBgColor, B_LIGHTEN_2_TINT));
-		}
-	} else {
-		SetHighColor(tint_color(panelBgColor, B_DISABLED_LABEL_TINT));
-		SetLowColor(tint_color(panelBgColor, B_LIGHTEN_2_TINT));
-	}
-
-	// Draw the label
-	DrawString(text.String(), BPoint(x, labelY));
-
-	// Focus line
-	if (enabled && IsFocus() && Window()->IsActive() && !pushed)
-		DrawFocusLine(x,focusLineY,stringWidth,true);
-#else
-	// Default indicator
-	if (IsDefault())
-		rect = DrawDefault(rect, enabled);
 
 	BRect fillArea = rect;
 	fillArea.InsetBy(3.0, 3.0);
@@ -287,7 +164,7 @@ BButton::Draw(BRect updateRect)
 			rect.InsetBy(2.0, 2.0);
 			InvertRect(rect);
 		} else {
-			DrawFocusLine(x, focusLineY, stringWidth, IsFocus()
+			_DrawFocusLine(x, focusLineY, stringWidth, IsFocus()
 				&& Window()->IsActive());
 		}
 
@@ -465,8 +342,7 @@ BButton::Draw(BRect updateRect)
 
 	// Focus line
 	if (enabled && IsFocus() && Window()->IsActive() && !pushed)
-		DrawFocusLine(x, focusLineY, stringWidth, true);
+		_DrawFocusLine(x, focusLineY, stringWidth, true);
-#endif
 }
 
 
@@ -829,107 +705,6 @@ BButton::operator=(const BButton &)
 }
 
 
-BRect
-BButton::DrawDefault(BRect bounds, bool enabled)
-{
-#if 0
-	rgb_color no_tint = ui_color(B_PANEL_BACKGROUND_COLOR),
-	lighten1 = tint_color(no_tint, B_LIGHTEN_1_TINT),
-	darken1 = tint_color(no_tint, B_DARKEN_1_TINT);
-
-	rgb_color borderColor;
-	if (enabled)
-		borderColor = tint_color(no_tint, B_DARKEN_4_TINT);
-	else
-		borderColor = darken1;
-
-	// Dark border
-	BeginLineArray(4);
-	AddLine(BPoint(bounds.left, bounds.bottom - 1.0f),
-		BPoint(bounds.left, bounds.top + 1.0f), borderColor);
-	AddLine(BPoint(bounds.left + 1.0f, bounds.top),
-		BPoint(bounds.right - 1.0f, bounds.top), borderColor);
-	AddLine(BPoint(bounds.right, bounds.top + 1.0f),
-		BPoint(bounds.right, bounds.bottom - 1.0f), borderColor);
-	AddLine(BPoint(bounds.left + 1.0f, bounds.bottom),
-		BPoint(bounds.right - 1.0f, bounds.bottom), borderColor);
-	EndLineArray();
-
-	if (enabled) {
-		// Bevel
-		bounds.InsetBy(1.0f, 1.0f);
-		SetHighColor(darken1);
-		StrokeRect(bounds);
-	}
-
-	bounds.InsetBy(1.0f, 1.0f);
-
-	// Filling
-	float inset = enabled? 2.0f : 3.0f;
-	SetHighColor(lighten1);
-
-	FillRect(BRect(bounds.left, bounds.top,
-		bounds.right, bounds.top+inset-1.0f));
-	FillRect(BRect(bounds.left, bounds.bottom-inset+1.0f,
-		bounds.right, bounds.bottom));
-	FillRect(BRect(bounds.left, bounds.top+inset-1.0f,
-		bounds.left+inset-1.0f, bounds.bottom-inset+1.0f));
-	FillRect(BRect(bounds.right-inset+1.0f, bounds.top+inset-1.0f,
-		bounds.right, bounds.bottom-inset+1.0f));
-
-	bounds.InsetBy(inset,inset);
-
-	return bounds;
-#else
-	rgb_color low = LowColor();
-	rgb_color focusColor = tint_color(low, enabled ? (B_DARKEN_1_TINT + B_DARKEN_2_TINT) / 2
-												   : (B_NO_TINT + B_DARKEN_1_TINT) / 2);
-
-	SetHighColor(focusColor);
-
-	StrokeRect(bounds, B_SOLID_LOW);
-	bounds.InsetBy(1.0, 1.0);
-	StrokeRect(bounds);
-	bounds.InsetBy(1.0, 1.0);
-	StrokeRect(bounds);
-	bounds.InsetBy(1.0, 1.0);
-
-	return bounds;
-#endif
-}
-
-
-status_t
-BButton::Execute()
-{
-	if (!IsEnabled())
-		return B_ERROR;
-
-	SetValue(B_CONTROL_ON);
-	return Invoke();
-}
-
-
-void
-BButton::DrawFocusLine(float x, float y, float width, bool visible)
-{
-	if (visible)
-		SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR));
-	else {
-		SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
-			B_LIGHTEN_1_TINT));
-	}
-
-	// Blue Line
-	StrokeLine(BPoint(x, y), BPoint(x + width, y));
-
-	if (visible)
-		SetHighColor(255, 255, 255);
-	// White Line
-	StrokeLine(BPoint(x, y + 1.0f), BPoint(x + width, y + 1.0f));
-}
-
-
 BSize
 BButton::_ValidatePreferredSize()
 {
@@ -956,3 +731,45 @@ BButton::_ValidatePreferredSize()
 	return fPreferredSize;
 }
 
+
+BRect
+BButton::_DrawDefault(BRect bounds, bool enabled)
+{
+	rgb_color low = LowColor();
+	rgb_color focusColor = tint_color(low, enabled ?
+		(B_DARKEN_1_TINT + B_DARKEN_2_TINT) / 2
+		: (B_NO_TINT + B_DARKEN_1_TINT) / 2);
+
+	SetHighColor(focusColor);
+
+	StrokeRect(bounds, B_SOLID_LOW);
+	bounds.InsetBy(1.0, 1.0);
+	StrokeRect(bounds);
+	bounds.InsetBy(1.0, 1.0);
+	StrokeRect(bounds);
+	bounds.InsetBy(1.0, 1.0);
+
+	return bounds;
+}
+
+
+void
+BButton::_DrawFocusLine(float x, float y, float width, bool visible)
+{
+	if (visible)
+		SetHighColor(ui_color(B_KEYBOARD_NAVIGATION_COLOR));
+	else {
+		SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
+			B_LIGHTEN_1_TINT));
+	}
+
+	// Blue Line
+	StrokeLine(BPoint(x, y), BPoint(x + width, y));
+
+	if (visible)
+		SetHighColor(255, 255, 255);
+	// White Line
+	StrokeLine(BPoint(x, y + 1.0f), BPoint(x + width, y + 1.0f));
+}
+
+