Fix regression caused by me in r38207, pointed out by diver in #6407, thanks!

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38251 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alex Wilson 2010-08-18 22:01:57 +00:00
parent 2d05ca4e7a
commit a881dd4a37
2 changed files with 9 additions and 13 deletions

View File

@ -69,7 +69,7 @@ IsFontUsable(const BFont& font)
AppearancePrefView::AppearancePrefView(const char* name,
const BMessenger& messenger)
:
BView(name, B_WILL_DRAW),
BGroupView(name, B_VERTICAL, 5),
fTerminalMessenger(messenger)
{
const char* kColorTable[] = {
@ -108,11 +108,8 @@ AppearancePrefView::AppearancePrefView(const char* name,
colorsPopUp);
fColorField->SetEnabled(false);
BGroupLayout* layout = new BGroupLayout(B_HORIZONTAL);
SetLayout(layout);
BLayoutBuilder::Group<>(layout)
BLayoutBuilder::Group<>(this)
.SetInsets(5, 5, 5, 5)
.AddGroup(B_VERTICAL, 5)
.AddGrid(5, 5)
.Add(fFont->CreateLabelLayoutItem(), 0, 0)
.Add(fFont->CreateMenuBarLayoutItem(), 1, 0)
@ -122,12 +119,11 @@ AppearancePrefView::AppearancePrefView(const char* name,
.Add(fColorSchemaField->CreateMenuBarLayoutItem(), 1, 2)
.Add(fColorField->CreateLabelLayoutItem(), 0, 3)
.Add(fColorField->CreateMenuBarLayoutItem(), 1, 3)
. End()
.AddGroup(B_VERTICAL, 5)
.AddGlue()
.Add(fColorControl = new BColorControl(BPoint(10, 10),
B_CELLS_32x8, 8.0, "", new BMessage(MSG_COLOR_CHANGED)))
.Add(fWarnOnExit);
.End()
.AddGlue()
.Add(fColorControl = new BColorControl(BPoint(10, 10),
B_CELLS_32x8, 8.0, "", new BMessage(MSG_COLOR_CHANGED)))
.Add(fWarnOnExit);
fFont->SetAlignment(B_ALIGN_RIGHT);
fFontSize->SetAlignment(B_ALIGN_RIGHT);

View File

@ -10,7 +10,7 @@
#include <Messenger.h>
#include <String.h>
#include <View.h>
#include <GroupView.h>
const ulong MSG_HALF_FONT_CHANGED = 'mchf';
@ -36,7 +36,7 @@ class BMenuField;
class BPopUpMenu;
class BCheckBox;
class AppearancePrefView : public BView {
class AppearancePrefView : public BGroupView {
public:
AppearancePrefView(const char *name,
const BMessenger &messenger);