Automatic whitespace cleanup. No functional change.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37002 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Matt Madia
2010-06-03 00:06:48 +00:00
parent 23aa437d66
commit 0c9714ba30
5 changed files with 15 additions and 15 deletions
+10 -10
View File
@@ -60,7 +60,7 @@ ControlView::AttachedToWindow()
{ {
BRect rect(Bounds()); BRect rect(Bounds());
rect.InsetBySelf(10, 0); rect.InsetBySelf(10, 0);
rect.bottom = rect.top + 18; rect.bottom = rect.top + 18;
rect.OffsetBy(0, 11); rect.OffsetBy(0, 11);
float offsetX = 0; float offsetX = 0;
@@ -112,10 +112,10 @@ ControlView::AttachedToWindow()
new BMessage(ALIASING_MSG)); new BMessage(ALIASING_MSG));
fAliasingCheckBox->SetValue(B_CONTROL_ON); fAliasingCheckBox->SetValue(B_CONTROL_ON);
AddChild(fAliasingCheckBox); AddChild(fAliasingCheckBox);
rect.OffsetBy(0.0, offsetX); rect.OffsetBy(0.0, offsetX);
fDrawingModeMenu = new BMenu("drawingmodemenu"); fDrawingModeMenu = new BMenu("drawingmodemenu");
BMessage* drawingMsg = NULL; BMessage* drawingMsg = NULL;
drawingMsg = new BMessage(DRAWINGMODE_CHANGED_MSG); drawingMsg = new BMessage(DRAWINGMODE_CHANGED_MSG);
drawingMsg->AddInt32("_mode", B_OP_COPY); drawingMsg->AddInt32("_mode", B_OP_COPY);
@@ -151,9 +151,9 @@ ControlView::AttachedToWindow()
drawingMsg = new BMessage(DRAWINGMODE_CHANGED_MSG); drawingMsg = new BMessage(DRAWINGMODE_CHANGED_MSG);
drawingMsg->AddInt32("_mode", B_OP_ALPHA); drawingMsg->AddInt32("_mode", B_OP_ALPHA);
fDrawingModeMenu->AddItem(new BMenuItem("B_OP_ALPHA", drawingMsg)); fDrawingModeMenu->AddItem(new BMenuItem("B_OP_ALPHA", drawingMsg));
fDrawingModeMenu->SetLabelFromMarked(true); fDrawingModeMenu->SetLabelFromMarked(true);
BMenuField *drawingModeMenuField = new BMenuField(rect, "FontMenuField", "Drawing mode:", fDrawingModeMenu, true); BMenuField *drawingModeMenuField = new BMenuField(rect, "FontMenuField", "Drawing mode:", fDrawingModeMenu, true);
drawingModeMenuField->SetDivider(5+StringWidth("Drawing mode:")); drawingModeMenuField->SetDivider(5+StringWidth("Drawing mode:"));
AddChild(drawingModeMenuField); AddChild(drawingModeMenuField);
@@ -190,7 +190,7 @@ ControlView::Draw(BRect updateRect)
SetHighColor(tint_color(ViewColor(), B_DARKEN_2_TINT)); SetHighColor(tint_color(ViewColor(), B_DARKEN_2_TINT));
StrokeLine(rect.LeftBottom(), rect.RightBottom()); StrokeLine(rect.LeftBottom(), rect.RightBottom());
StrokeLine(rect.RightBottom(), rect.RightTop()); StrokeLine(rect.RightBottom(), rect.RightTop());
} }
@@ -266,7 +266,7 @@ ControlView::MessageReceived(BMessage* msg)
fMessenger->SendMessage(&msg); fMessenger->SendMessage(&msg);
break; break;
} }
case ALIASING_MSG: case ALIASING_MSG:
{ {
BMessage msg(ALIASING_MSG); BMessage msg(ALIASING_MSG);
@@ -319,7 +319,7 @@ ControlView::MessageReceived(BMessage* msg)
} }
case CYCLING_FONTS_UPDATE_MSG: case CYCLING_FONTS_UPDATE_MSG:
{ {
int32 familyindex = -1; int32 familyindex = -1;
BMenuItem* currentFamilyItem = fFontFamilyMenu->FindMarked(); BMenuItem* currentFamilyItem = fFontFamilyMenu->FindMarked();
@@ -403,7 +403,7 @@ ControlView::_UpdateFontmenus(bool setInitialfont)
familyMsg->AddString("_family", fontFamilyName); familyMsg->AddString("_family", fontFamilyName);
BMenuItem* familyItem = new BMenuItem(stylemenu, familyMsg); BMenuItem* familyItem = new BMenuItem(stylemenu, familyMsg);
fFontFamilyMenu->AddItem(familyItem); fFontFamilyMenu->AddItem(familyItem);
for (int32 j = 0; j < styles; j++) { for (int32 j = 0; j < styles; j++) {
if (get_font_style(fontFamilyName, j, &fontStyleName) == B_OK) { if (get_font_style(fontFamilyName, j, &fontStyleName) == B_OK) {
BMessage* fontMsg = new BMessage(FONTSTYLE_CHANGED_MSG); BMessage* fontMsg = new BMessage(FONTSTYLE_CHANGED_MSG);
@@ -538,7 +538,7 @@ ControlView::_DeselectOldItems()
if (submenu) { if (submenu) {
BMenuItem* marked = submenu->FindMarked(); BMenuItem* marked = submenu->FindMarked();
if (marked) if (marked)
marked->SetMarked(false); marked->SetMarked(false);
} }
} }
} }
+1 -1
View File
@@ -56,7 +56,7 @@ class ControlView : public BView {
BButton* fCyclingFontButton; BButton* fCyclingFontButton;
BMenu* fFontFamilyMenu; BMenu* fFontFamilyMenu;
BMenu* fDrawingModeMenu; BMenu* fDrawingModeMenu;
bool fCycleFonts; bool fCycleFonts;
int32 fFontStyleindex; int32 fFontStyleindex;
}; };
+2 -2
View File
@@ -33,7 +33,7 @@ FontDemo::FontDemo()
controlView->SetTarget(demoView); controlView->SetTarget(demoView);
demoWindow->Show(); demoWindow->Show();
controlWindow->Show(); controlWindow->Show();
} }
@@ -46,7 +46,7 @@ FontDemo::~FontDemo()
void void
FontDemo::ReadyToRun() FontDemo::ReadyToRun()
{ {
} }
+1 -1
View File
@@ -2,7 +2,7 @@
resource app_signature "application/x-vnd.Haiku-FontDemo"; resource app_signature "application/x-vnd.Haiku-FontDemo";
resource app_version { resource app_version {
major = 1, major = 1,
middle = 0, middle = 0,
minor = 0, minor = 0,
+1 -1
View File
@@ -57,7 +57,7 @@ class FontDemoView : public BView {
BBitmap* fBitmap; BBitmap* fBitmap;
BView* fBufferView; BView* fBufferView;
char* fString; char* fString;
float fFontSize; float fFontSize;
float fSpacing; float fSpacing;