The creation of the parameter views now happens before the sub-groups are

added to the group. That way, a title view can be identified and always
placed at the top of the view.
Fixed minor related bugs.


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

src/kits/media/DefaultMediaTheme.cpp

@@ -251,14 +251,44 @@ DefaultMediaTheme::MakeViewFor(BParameterGroup &group, const BRect &hintRect)
 		return NULL;
 
 	BRect rect(hintRect);
-	BView *view = new BView(rect, group.Name(), B_FOLLOW_ALL, B_WILL_DRAW);
+	BView *view = new BView(rect, group.Name(), B_FOLLOW_NONE, B_WILL_DRAW);
 	view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
 
-	// Add the sub-group views
+	// Create the parameter views - but don't add them yet
 
 	rect.OffsetTo(B_ORIGIN);
 	rect.InsetBySelf(5, 5);
+	
+	BList views;
+	for (int32 i = 0; i < group.CountParameters(); i++) {
+		BParameter *parameter = group.ParameterAt(i);
+		if (parameter == NULL)
+			continue;
+
+		BView *parameterView = MakeSelfHostingViewFor(*parameter, rect);
+		if (parameterView == NULL)
+			continue;
+
+		parameterView->SetViewColor(view->ViewColor());
+			// ToDo: dunno why this is needed, but the controls
+			// sometimes (!) have a white background without it
+
+		views.AddItem(parameterView);
+	}
+
+	// Identify a title view, and add it at the top if present
+
+	TitleView *titleView = dynamic_cast<TitleView *>((BView *)views.ItemAt(0));
+	if (titleView != NULL) {
+		view->AddChild(titleView);
+		rect.OffsetBy(0, titleView->Bounds().Height());
+	}
+
+	// Add the sub-group views
+	
 	rect.right = rect.left + 50;
+	rect.bottom = rect.top + 10;
+	float lastHeight;
 
 	for (int32 i = 0; i < group.CountGroups(); i++) {
 		BParameterGroup *subGroup = group.GroupAt(i);
@@ -271,9 +301,11 @@ DefaultMediaTheme::MakeViewFor(BParameterGroup &group, const BRect &hintRect)
 
 		if (i > 0) {
 			// add separator view
-			BRect separatorRect(rect);
+			BRect separatorRect(groupView->Frame());
 			separatorRect.left -= 3;
 			separatorRect.right = separatorRect.left + 1;
+			if (lastHeight > separatorRect.Height())
+				separatorRect.bottom = separatorRect.top + lastHeight;
 
 			view->AddChild(new SeparatorView(separatorRect));
 		}
@@ -282,31 +314,33 @@ DefaultMediaTheme::MakeViewFor(BParameterGroup &group, const BRect &hintRect)
 
 		rect.OffsetBy(groupView->Bounds().Width() + 5, 0);
 
-		if (groupView->Bounds().Height() > rect.Height())
+		lastHeight = groupView->Bounds().Height();
-			rect.bottom = groupView->Bounds().Height() - 1;
+		if (lastHeight > rect.Height())
+			rect.bottom = rect.top + lastHeight - 1;
 	}
 
-	view->ResizeTo(rect.left + 10, rect.bottom + 10);
+	view->ResizeTo(rect.left + 10, rect.bottom + 5);
-	rect.left = 5;
-
-	// add the parameter views part of the group
 
 	if (group.CountParameters() == 0)
 		return view;
 
-	if (view->CountChildren() > 0)
+	// add the parameter views part of the group
-		rect.OffsetBy(0, rect.Height() + 10);
+
+	if (group.CountGroups() > 0) {
+		rect.top = rect.bottom + 10;
+		rect.bottom = rect.top + 20;
+	}
 
-	BList views;
 	bool center = false;
 
-	for (int32 i = 0; i < group.CountParameters(); i++) {
+	for (int32 i = 0; i < views.CountItems(); i++) {
-		BParameter *parameter = group.ParameterAt(i);
+		BView *parameterView = static_cast<BView *>(views.ItemAt(i));
-		if (parameter == NULL)
-			continue;
 
-		BView *parameterView = MakeSelfHostingViewFor(*parameter, rect);
+		if (parameterView->Bounds().Width() + 5 > rect.Width())
-		if (parameterView == NULL)
+			rect.right = parameterView->Bounds().Width() + rect.left + 5;
+
+		// we don't need to add the title view again
+		if (parameterView == titleView)
 			continue;
 
 		// if there is a BChannelSlider (ToDo: or any vertical slider?)
@@ -314,20 +348,13 @@ DefaultMediaTheme::MakeViewFor(BParameterGroup &group, const BRect &hintRect)
 		if (dynamic_cast<BChannelSlider *>(parameterView) != NULL)
 			center = true;
 
-		parameterView->SetViewColor(view->ViewColor());
+		parameterView->MoveTo(parameterView->Frame().left, rect.top);
-			// ToDo: dunno why this is needed, but the controls
-			// sometimes (!) have a white background without it
-
 		view->AddChild(parameterView);
-		views.AddItem(parameterView);
 
 		rect.OffsetBy(0, parameterView->Bounds().Height() + 5);
-
-		if (parameterView->Bounds().Width() + 5 > rect.Width())
-			rect.right = parameterView->Bounds().Width() + rect.left + 5;
 	}
 
-	if (group.CountParameters() > 0)
+	if (views.CountItems() > (titleView != NULL ? 1 : 0))
 		view->ResizeTo(rect.right + 5, rect.top + 5);
 
 	// center the parameter views if needed, and tweak some views