i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/terminal/AppearPrefView.cpp
+7 -11
View File
@@ -69,7 +69,7 @@ IsFontUsable(const BFont& font)
AppearancePrefView::AppearancePrefView(const char* name, AppearancePrefView::AppearancePrefView(const char* name,
const BMessenger& messenger) const BMessenger& messenger)
: :
BView(name, B_WILL_DRAW), BGroupView(name, B_VERTICAL, 5),
fTerminalMessenger(messenger) fTerminalMessenger(messenger)
{ {
const char* kColorTable[] = { const char* kColorTable[] = {
@@ -108,11 +108,8 @@ AppearancePrefView::AppearancePrefView(const char* name,
colorsPopUp); colorsPopUp);
fColorField->SetEnabled(false); fColorField->SetEnabled(false);
BGroupLayout* layout = new BGroupLayout(B_HORIZONTAL); BLayoutBuilder::Group<>(this)
SetLayout(layout);
BLayoutBuilder::Group<>(layout)
.SetInsets(5, 5, 5, 5) .SetInsets(5, 5, 5, 5)
.AddGroup(B_VERTICAL, 5)
.AddGrid(5, 5) .AddGrid(5, 5)
.Add(fFont->CreateLabelLayoutItem(), 0, 0) .Add(fFont->CreateLabelLayoutItem(), 0, 0)
.Add(fFont->CreateMenuBarLayoutItem(), 1, 0) .Add(fFont->CreateMenuBarLayoutItem(), 1, 0)
@@ -122,12 +119,11 @@ AppearancePrefView::AppearancePrefView(const char* name,
.Add(fColorSchemaField->CreateMenuBarLayoutItem(), 1, 2) .Add(fColorSchemaField->CreateMenuBarLayoutItem(), 1, 2)
.Add(fColorField->CreateLabelLayoutItem(), 0, 3) .Add(fColorField->CreateLabelLayoutItem(), 0, 3)
.Add(fColorField->CreateMenuBarLayoutItem(), 1, 3) .Add(fColorField->CreateMenuBarLayoutItem(), 1, 3)
. End() .End()
.AddGroup(B_VERTICAL, 5) .AddGlue()
.AddGlue() .Add(fColorControl = new BColorControl(BPoint(10, 10),
.Add(fColorControl = new BColorControl(BPoint(10, 10), B_CELLS_32x8, 8.0, "", new BMessage(MSG_COLOR_CHANGED)))
B_CELLS_32x8, 8.0, "", new BMessage(MSG_COLOR_CHANGED))) .Add(fWarnOnExit);
.Add(fWarnOnExit);
fFont->SetAlignment(B_ALIGN_RIGHT); fFont->SetAlignment(B_ALIGN_RIGHT);
fFontSize->SetAlignment(B_ALIGN_RIGHT); fFontSize->SetAlignment(B_ALIGN_RIGHT);
src/apps/terminal/AppearPrefView.h
+2 -2
View File
@@ -10,7 +10,7 @@
#include <Messenger.h> #include <Messenger.h>
#include <String.h> #include <String.h>
#include <View.h> #include <GroupView.h>
const ulong MSG_HALF_FONT_CHANGED = 'mchf'; const ulong MSG_HALF_FONT_CHANGED = 'mchf';
@@ -36,7 +36,7 @@ class BMenuField;
class BPopUpMenu; class BPopUpMenu;
class BCheckBox; class BCheckBox;
class AppearancePrefView : public BView { class AppearancePrefView : public BGroupView {
public: public:
AppearancePrefView(const char *name, AppearancePrefView(const char *name,
const BMessenger &messenger); const BMessenger &messenger);