* Updated header indentation

* Removed unused fClean member
* Got rid of fSkipSetFlags member by simply calling the BView::SetFlags()
  directly where fSkipSetFlags was supposed to prevent the custom
  implementation.
* Added some debugging facilities.
* Used the layout friendly constructors of BControl where appropriate.
* Used B_FOLLOW_ALL for the child text input, it should be more correct.


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

headers/os/interface/TextControl.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2006, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2008, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef	_TEXT_CONTROL_H
@@ -15,11 +15,12 @@ class _BTextInput_;
 }
 
 class BTextControl : public BControl {
-	public:
+public:
 								BTextControl(BRect frame, const char* name,
 									const char* label, const char* initialText,
 									BMessage* message,
-								uint32 resizeMode = B_FOLLOW_LEFT | B_FOLLOW_TOP,
+									uint32 resizeMode
+										= B_FOLLOW_LEFT | B_FOLLOW_TOP,
 									uint32 flags = B_WILL_DRAW | B_NAVIGABLE); 
 								BTextControl(const char* name,
 									const char* label, const char* initialText,
@@ -32,7 +33,8 @@ class BTextControl : public BControl {
 
 								BTextControl(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				SetText(const char* text);
 			const char*			Text() const;
@@ -46,7 +48,8 @@ class BTextControl : public BControl {
 			BMessage*			ModificationMessage() const;
 
 	virtual	void				SetAlignment(alignment label, alignment text);
-		void				GetAlignment(alignment* _label, alignment* _text) const;
+			void				GetAlignment(alignment* _label,
+									alignment* _text) const;
 	virtual	void				SetDivider(float position);
 			float				Divider() const;
 
@@ -80,7 +83,7 @@ class BTextControl : public BControl {
 			BLayoutItem*		CreateLabelLayoutItem();
 			BLayoutItem*		CreateTextViewLayoutItem();
 
-	private:
+private:
 	class LabelLayoutItem;
 	class TextViewLayoutItem;
 
@@ -105,7 +108,7 @@ class BTextControl : public BControl {
 			void				_LayoutTextView();
 			void				_UpdateFrame();
 
-	private:
+private:
 			BPrivate::_BTextInput_* fText;
 			char*				fLabel;
 			BMessage*			fModificationMessage;
@@ -116,13 +119,7 @@ class BTextControl : public BControl {
 			BLayoutItem*		fLabelLayoutItem;
 			BLayoutItem*		fTextViewLayoutItem;
 
-		uint32				_reserved[4];
+			uint32				_reserved[5];
-
-		bool				fClean;
-		bool				fSkipSetFlags;
-
-		bool				_reserved1;
-		bool				_reserved2;
 };
 
 #endif	// _TEXT_CONTROL_H

src/kits/interface/TextControl.cpp

@@ -23,6 +23,21 @@
 #include "TextInput.h"
 
 
+//#define TRACE_TEXT_CONTROL
+#ifdef TRACE_TEXT_CONTROL
+#	include <FunctionTracer.h>
+	static int32 sFunctionDepth = -1;
+#	define CALLED(x...)	FunctionTracer _ft("BMenuField", __FUNCTION__, \
+							sFunctionDepth)
+#	define TRACE(x...)	{ BString _to; \
+							_to.Append(' ', (sFunctionDepth + 1) * 2); \
+							printf("%s", _to.String()); printf(x); }
+#else
+#	define CALLED(x...)
+#	define TRACE(x...)
+#endif
+
+
 class BTextControl::LabelLayoutItem : public BAbstractLayoutItem {
 public:
 								LabelLayoutItem(BTextControl* parent);
@@ -83,8 +98,7 @@ BTextControl::BTextControl(BRect frame, const char* name, const char* label,
 
 BTextControl::BTextControl(const char* name, const char* label,
 		const char* text, BMessage* message, uint32 flags)
-	: BControl(BRect(0, 0, -1, -1), name, label, message, B_FOLLOW_NONE,
+	: BControl(name, label, message, flags | B_FRAME_EVENTS)
-		flags | B_FRAME_EVENTS | B_SUPPORTS_LAYOUT)
 {
 	_InitData(label, text);
 	_ValidateLayout();
@@ -93,8 +107,8 @@ BTextControl::BTextControl(const char* name, const char* label,
 
 BTextControl::BTextControl(const char* label, const char* text,
 		BMessage* message)
-	: BControl(BRect(0, 0, -1, -1), NULL, label, message, B_FOLLOW_NONE,
+	: BControl(NULL, label, message,
-		B_WILL_DRAW | B_NAVIGABLE | B_FRAME_EVENTS | B_SUPPORTS_LAYOUT)
+		B_WILL_DRAW | B_NAVIGABLE | B_FRAME_EVENTS)
 {
 	_InitData(label, text);
 	_ValidateLayout();
@@ -172,6 +186,8 @@ BTextControl::SetText(const char *text)
 	if (InvokeKind() != B_CONTROL_INVOKED)
 		return;
 
+	CALLED();
+
 	fText->SetText(text);
 
 	if (IsFocus())
@@ -459,7 +475,6 @@ BTextControl::ResizeToPreferred()
 void
 BTextControl::SetFlags(uint32 flags)
 {
-	if (!fSkipSetFlags) {
 	// If the textview is navigable, set it to not navigable if needed
 	// Else if it is not navigable, set it to navigable if needed
 	if (fText->Flags() & B_NAVIGABLE) {
@@ -473,7 +488,6 @@ BTextControl::SetFlags(uint32 flags)
 
 	// Don't make this one navigable
 	flags &= ~B_NAVIGABLE;
-	}
 
 	BView::SetFlags(flags);
 }
@@ -565,6 +579,8 @@ BTextControl::FrameMoved(BPoint newPosition)
 void
 BTextControl::FrameResized(float width, float height)
 {
+	CALLED();
+
 	BControl::FrameResized(width, height);
 
 	// changes in width
@@ -602,6 +618,8 @@ BTextControl::FrameResized(float width, float height)
 
 	fPreviousWidth = uint16(bounds.Width());
 	fPreviousHeight = uint16(bounds.Height());
+
+	TRACE("width: %.2f, height: %.2f\n", bounds.Width(), bounds.Height());
 }
 
 
@@ -709,7 +727,6 @@ BTextControl::_InitData(const char* label, const char* initialText,
 	fPreviousHeight = bounds.Height();
 	fLabelLayoutItem = NULL;
 	fTextViewLayoutItem = NULL;
-	fSkipSetFlags = false;
 
 	int32 flags = 0;
 
@@ -728,11 +745,8 @@ BTextControl::_InitData(const char* label, const char* initialText,
 		fDivider = floorf(bounds.Width() / 2.0f);
 
 	uint32 navigableFlags = Flags() & B_NAVIGABLE;
-	if (navigableFlags != 0) {
+	if (navigableFlags != 0)
-		fSkipSetFlags = true;
+		BView::SetFlags(Flags() & ~B_NAVIGABLE);
-		SetFlags(Flags() & ~B_NAVIGABLE);
-		fSkipSetFlags = false;
-	}
 
 	if (archive)
 		fText = static_cast<BPrivate::_BTextInput_*>(FindView("_input_"));
@@ -745,8 +759,7 @@ BTextControl::_InitData(const char* label, const char* initialText,
 		BRect textRect(frame.OffsetToCopy(B_ORIGIN));
 
 		fText = new BPrivate::_BTextInput_(frame, textRect,
-			B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP,
+			B_FOLLOW_ALL, B_WILL_DRAW | B_FRAME_EVENTS | navigableFlags);
-			B_WILL_DRAW | B_FRAME_EVENTS | navigableFlags);
 		AddChild(fText);
 
 		SetText(initialText);
@@ -759,6 +772,8 @@ BTextControl::_InitData(const char* label, const char* initialText,
 void
 BTextControl::_ValidateLayout()
 {
+	CALLED();
+
 	float height;
 	BTextControl::GetPreferredSize(NULL, &height);
 
@@ -773,6 +788,8 @@ BTextControl::_ValidateLayout()
 void
 BTextControl::_LayoutTextView()
 {
+	CALLED();
+
 	BRect frame = Bounds();
 	frame.left = fDivider;
 	// we are stroking the frame around the text view, which
@@ -781,6 +798,11 @@ BTextControl::_LayoutTextView()
 	fText->MoveTo(frame.left, frame.top);
 	fText->ResizeTo(frame.Width(), frame.Height());
 	fText->AlignTextRect();
+
+	TRACE("width: %.2f, height: %.2f\n", Frame().Width(), Frame().Height());
+	TRACE("fDivider: %.2f\n", fDivider);
+	TRACE("fText frame: (%.2f, %.2f, %.2f, %.2f)\n",
+		frame.left, frame.top, frame.right, frame.bottom);
 }