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

fixing indenting style issues

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20243 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2007-02-27 00:31:31 +00:00
parent 641591259c
commit bb377cd514
7 changed files with 257 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/backgrounds/BackgroundImage.cpp
+2 -2
View File
@@ -151,7 +151,7 @@ BackgroundImage::GetBackgroundImage(const BNode *node, bool isDesktop,
result->fImageSetPeriod = imageSetPeriod; result->fImageSetPeriod = imageSetPeriod;
result->fCacheMode = globalCacheMode; result->fCacheMode = globalCacheMode;
if (result->fImageSetCount > 1) if (result->fImageSetCount > 1)
result->fShowingImageSet = random()%result->fImageSetCount; result->fShowingImageSet = random() % result->fImageSetCount;
} }
return result; return result;
@@ -440,7 +440,7 @@ BackgroundImage::SetBackgroundImage(BNode *node)
PRINT_OBJECT(container); PRINT_OBJECT(container);
size_t flattenedSize = container.FlattenedSize(); size_t flattenedSize = container.FlattenedSize();
char* buffer = new (std::nothrow) char[flattenedSize]; char* buffer = new(std::nothrow) char[flattenedSize];
if (buffer == NULL) if (buffer == NULL)
return B_NO_MEMORY; return B_NO_MEMORY;
src/preferences/backgrounds/BackgroundImage.h
+2 -2
View File
@@ -70,7 +70,7 @@ class BackgroundImage {
// view and how. // view and how.
// Unlike other windows, the Desktop window can have different backgrounds // Unlike other windows, the Desktop window can have different backgrounds
// for each workspace // for each workspace
public: public:
enum Mode { enum Mode {
kAtOffset, kAtOffset,
@@ -134,7 +134,7 @@ public:
void Remove(BackgroundImageInfo *); void Remove(BackgroundImageInfo *);
void RemoveAll(); void RemoveAll();
private: private:
BackgroundImage(const BNode *node, bool isDesktop, BackgroundsView* view); BackgroundImage(const BNode *node, bool isDesktop, BackgroundsView* view);
// no public constructor, GetBackgroundImage factory function is // no public constructor, GetBackgroundImage factory function is
// used instead // used instead
src/preferences/backgrounds/BackgroundsView.cpp
+76 -76
View File
@@ -51,39 +51,39 @@ static const uint32 kMsgUpdatePreviewPlacement = 'pvpl';
const uint8 kHandCursorData[68] = { const uint8 kHandCursorData[68] = {
16, 1, 2, 2, 16, 1, 2, 2,
0,0, // 0000000000000000 0, 0, // 0000000000000000
7,128, // 0000011110000000 7, 128, // 0000011110000000
61,112, // 0011110101110000 61, 112, // 0011110101110000
37,40, // 0010010100101000 37, 40, // 0010010100101000
36,168, // 0010010010101000 36, 168, // 0010010010101000
18,148, // 0001001010010100 18, 148, // 0001001010010100
18,84, // 0001001001010100 18, 84, // 0001001001010100
9,42, // 0000100100101010 9, 42, // 0000100100101010
8,1, // 0000100000000001 8, 1, // 0000100000000001
60,1, // 0011110000000001 60, 1, // 0011110000000001
76,1, // 0100110000000001 76, 1, // 0100110000000001
66,1, // 0100001000000001 66, 1, // 0100001000000001
48,1, // 0011000000000001 48, 1, // 0011000000000001
12,1, // 0000110000000001 12, 1, // 0000110000000001
2,0, // 0000001000000000 2, 0, // 0000001000000000
1,0, // 0000000100000000 1, 0, // 0000000100000000
0,0, // 0000000000000000 0, 0, // 0000000000000000
7,128, // 0000011110000000 7, 128, // 0000011110000000
63,240, // 0011111111110000 63, 240, // 0011111111110000
63,248, // 0011111111111000 63, 248, // 0011111111111000
63,248, // 0011111111111000 63, 248, // 0011111111111000
31,252, // 0001111111111100 31, 252, // 0001111111111100
31,252, // 0001111111111100 31, 252, // 0001111111111100
15,254, // 0000111111111110 15, 254, // 0000111111111110
15,255, // 0000111111111111 15, 255, // 0000111111111111
63,255, // 0011111111111111 63, 255, // 0011111111111111
127,255, // 0111111111111111 127, 255, // 0111111111111111
127,255, // 0111111111111111 127, 255, // 0111111111111111
63,255, // 0011111111111111 63, 255, // 0011111111111111
15,255, // 0000111111111111 15, 255, // 0000111111111111
3,254, // 0000001111111110 3, 254, // 0000001111111110
1,248 // 0000000111111000 1, 248 // 0000000111111000
}; };
@@ -742,7 +742,7 @@ BackgroundsView::SaveSettings(void)
BFile file(path.Path(), B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE); BFile file(path.Path(), B_READ_WRITE | B_CREATE_FILE | B_ERASE_FILE);
BPoint point = Window()->Frame().LeftTop(); BPoint point = Window()->Frame().LeftTop();
if (fSettings.ReplacePoint("pos", point)!=B_OK) if (fSettings.ReplacePoint("pos", point) != B_OK)
fSettings.AddPoint("pos", point); fSettings.AddPoint("pos", point);
entry_ref ref; entry_ref ref;
@@ -814,7 +814,7 @@ BackgroundsView::LoadSettings()
s << "Folder: " << path.Leaf(); s << "Folder: " << path.Leaf();
BMenuItem *item = new BMenuItem(s.String(), BMenuItem *item = new BMenuItem(s.String(),
new BMessage(kMsgFolderSelected)); new BMessage(kMsgFolderSelected));
fWorkspaceMenu->AddItem(item, -i-1+6); fWorkspaceMenu->AddItem(item, -i - 1 + 6);
index++; index++;
} }
fWorkspaceMenu->SetTargetForItems(this); fWorkspaceMenu->SetTargetForItems(this);
@@ -910,7 +910,7 @@ BackgroundsView::FindPlacementMode()
#ifndef __HAIKU__ #ifndef __HAIKU__
inline bool operator!=(const rgb_color& x, const rgb_color& y) inline bool operator!=(const rgb_color& x, const rgb_color& y)
{ {
return (x.red!=y.red || x.blue!=y.blue || x.green!=y.green); return (x.red != y.red || x.blue != y.blue || x.green != y.green);
} }
#endif #endif
@@ -987,12 +987,12 @@ BackgroundsView::RefsReceived(BMessage *msg)
item = FindImageItem(index); item = FindImageItem(index);
fLastImageIndex = index; fLastImageIndex = index;
} else { } else {
const char* name = GetImage(-index-1)->GetName(); const char* name = GetImage(-index - 1)->GetName();
item = new BGImageMenuItem(name, -index-1, item = new BGImageMenuItem(name, -index - 1,
new BMessage(kMsgImageSelected)); new BMessage(kMsgImageSelected));
AddItem(item); AddItem(item);
item->SetTarget(this); item->SetTarget(this);
fLastImageIndex = -index-1; fLastImageIndex = -index - 1;
} }
item->SetMarked(true); item->SetMarked(true);
@@ -1014,9 +1014,9 @@ BackgroundsView::RefsReceived(BMessage *msg)
BString s; BString s;
s << "Folder: " << path.Leaf(); s << "Folder: " << path.Leaf();
item = new BMenuItem(s.String(), new BMessage(kMsgFolderSelected)); item = new BMenuItem(s.String(), new BMessage(kMsgFolderSelected));
fWorkspaceMenu->AddItem(item, -index-1+6); fWorkspaceMenu->AddItem(item, -index - 1 + 6);
item->SetTarget(this); item->SetTarget(this);
fLastWorkspaceIndex = -index-1 + 6; fLastWorkspaceIndex = -index - 1 + 6;
} }
item->SetMarked(true); item->SetMarked(true);
@@ -1031,7 +1031,7 @@ BackgroundsView::AddPath(BPath path)
{ {
int32 count = fPathList.CountItems(); int32 count = fPathList.CountItems();
int32 index = 0; int32 index = 0;
for(; index < count; index++) { for (; index < count; index++) {
BPath *p = fPathList.ItemAt(index); BPath *p = fPathList.ItemAt(index);
int c = BString(p->Path()).ICompare(path.Path()); int c = BString(p->Path()).ICompare(path.Path());
if (c == 0) if (c == 0)
@@ -1041,7 +1041,7 @@ BackgroundsView::AddPath(BPath path)
break; break;
} }
fPathList.AddItem(new BPath(path), index); fPathList.AddItem(new BPath(path), index);
return -index-1; return -index - 1;
} }
@@ -1050,14 +1050,14 @@ BackgroundsView::AddImage(BPath path)
{ {
int32 count = fImageList.CountItems(); int32 count = fImageList.CountItems();
int32 index = 0; int32 index = 0;
for(; index < count; index++) { for (; index < count; index++) {
Image *image = fImageList.ItemAt(index); Image *image = fImageList.ItemAt(index);
if (image->GetPath() == path) if (image->GetPath() == path)
return index; return index;
} }
fImageList.AddItem(new Image(path)); fImageList.AddItem(new Image(path));
return -index-1; return -index - 1;
} }
@@ -1147,7 +1147,7 @@ PreView::MouseDown(BPoint point)
if (IsEnabled() && Bounds().Contains(point)) { if (IsEnabled() && Bounds().Contains(point)) {
uint32 buttons; uint32 buttons;
GetMouse(&point, &buttons); GetMouse(&point, &buttons);
if(buttons & B_PRIMARY_MOUSE_BUTTON) { if (buttons & B_PRIMARY_MOUSE_BUTTON) {
fOldPoint = point; fOldPoint = point;
SetTracking(true); SetTracking(true);
BScreen().GetMode(&mode); BScreen().GetMode(&mode);
@@ -1178,8 +1178,8 @@ PreView::MouseMoved(BPoint point, uint32 transit, const BMessage *message)
if (IsTracking()) { if (IsTracking()) {
float x, y; float x, y;
x = fPoint.x + (point.x - fOldPoint.x)/ x_ratio; x = fPoint.x + (point.x - fOldPoint.x) / x_ratio;
y = fPoint.y + (point.y - fOldPoint.y)/ y_ratio; y = fPoint.y + (point.y - fOldPoint.y) / y_ratio;
bool min, max, mustSend = false; bool min, max, mustSend = false;
min = (x > -fImageBounds.Width()); min = (x > -fImageBounds.Width());
max = (x < mode.virtual_width); max = (x < mode.virtual_width);
@@ -1245,42 +1245,42 @@ PreviewBox::Draw(BRect rect)
rgb_color color = HighColor(); rgb_color color = HighColor();
SetHighColor(LowColor()); SetHighColor(LowColor());
FillRect(BRect(9,19,141,127)); FillRect(BRect(9, 19, 141, 127));
if (fIsDesktop) { if (fIsDesktop) {
BPoint points[] = { BPoint points[] = {
BPoint(11,19), BPoint(139,19), BPoint(141,21), BPoint(11, 19), BPoint(139, 19), BPoint(141, 21),
BPoint(141,119), BPoint(139,121), BPoint(118,121), BPoint(141, 119), BPoint(139, 121), BPoint(118, 121),
BPoint(118,126), BPoint(117,127), BPoint(33,127), BPoint(118, 126), BPoint(117, 127), BPoint(33, 127),
BPoint(32,126), BPoint(32,121),BPoint(11,121), BPoint(32, 126), BPoint(32, 121), BPoint(11, 121),
BPoint(9,119),BPoint(9,21),BPoint(11,19) BPoint(9, 119), BPoint(9, 21), BPoint(11, 19)
}; };
SetHighColor(184,184,184); SetHighColor(184, 184, 184);
FillPolygon(points, 15); FillPolygon(points, 15);
SetHighColor(96,96,96); SetHighColor(96, 96, 96);
StrokePolygon(points, 15); StrokePolygon(points, 15);
FillRect(BRect(107,121,111,123)); FillRect(BRect(107, 121, 111, 123));
SetHighColor(0,0,0); SetHighColor(0, 0, 0);
StrokeRect(BRect(14,24,136,116)); StrokeRect(BRect(14, 24, 136, 116));
SetHighColor(0,255,0); SetHighColor(0, 255, 0);
FillRect(BRect(101,122,103,123)); FillRect(BRect(101, 122, 103, 123));
} else { } else {
SetHighColor(152,152,152); SetHighColor(152, 152, 152);
StrokeLine(BPoint(11,13), BPoint(67,13)); StrokeLine(BPoint(11, 13), BPoint(67, 13));
StrokeLine(BPoint(67,21)); StrokeLine(BPoint(67, 21));
StrokeLine(BPoint(139,21)); StrokeLine(BPoint(139, 21));
StrokeLine(BPoint(139,119)); StrokeLine(BPoint(139, 119));
StrokeLine(BPoint(11,119)); StrokeLine(BPoint(11, 119));
StrokeLine(BPoint(11,13)); StrokeLine(BPoint(11, 13));
StrokeRect(BRect(14,24,136,116)); StrokeRect(BRect(14, 24, 136, 116));
SetHighColor(255,203,0); SetHighColor(255, 203, 0);
FillRect(BRect(12,14,66,21)); FillRect(BRect(12, 14, 66, 21));
SetHighColor(240,240,240); SetHighColor(240, 240, 240);
StrokeRect(BRect(12,22,137,117)); StrokeRect(BRect(12, 22, 137, 117));
StrokeLine(BPoint(138,22), BPoint(138,22)); StrokeLine(BPoint(138, 22), BPoint(138, 22));
StrokeLine(BPoint(12,118), BPoint(12,118)); StrokeLine(BPoint(12, 118), BPoint(12, 118));
SetHighColor(200,200,200); SetHighColor(200, 200, 200);
StrokeRect(BRect(13,23,138,118)); StrokeRect(BRect(13, 23, 138, 118));
} }
SetHighColor(color); SetHighColor(color);
src/preferences/backgrounds/BackgroundsView.h
+1 -1
View File
@@ -73,7 +73,7 @@ class PreView : public BControl {
void AttachedToWindow(); void AttachedToWindow();
BPoint fOldPoint; BPoint fOldPoint;
float x_ratio,y_ratio; float x_ratio, y_ratio;
display_mode mode; display_mode mode;
BCursor fMoveHandCursor; BCursor fMoveHandCursor;
src/preferences/backgrounds/ImageFilePanel.cpp
+7 -7
View File
@@ -96,14 +96,14 @@ ImageFilePanel::SelectionChanged()
if (bitmap != NULL) { if (bitmap != NULL) {
BRect dest(fImageView->Bounds()); BRect dest(fImageView->Bounds());
if (bitmap->Bounds().Width()>bitmap->Bounds().Height()) { if (bitmap->Bounds().Width() > bitmap->Bounds().Height()) {
dest.InsetBy(0, (dest.Height()+1 - dest.InsetBy(0, (dest.Height() + 1 -
((bitmap->Bounds().Height()+1) / ((bitmap->Bounds().Height() + 1) /
(bitmap->Bounds().Width()+1) * (dest.Width()+1)))/2); (bitmap->Bounds().Width() + 1) *(dest.Width() + 1))) / 2);
} else { } else {
dest.InsetBy((dest.Width()+1 - dest.InsetBy((dest.Width() + 1 -
((bitmap->Bounds().Width()+1) / ((bitmap->Bounds().Width() + 1) /
(bitmap->Bounds().Height()+1) * (dest.Height()+1)))/2, 0); (bitmap->Bounds().Height() + 1) *(dest.Height() + 1))) / 2, 0);
} }
fImageView->SetViewBitmap(bitmap, bitmap->Bounds(), dest, fImageView->SetViewBitmap(bitmap, bitmap->Bounds(), dest,
B_FOLLOW_LEFT | B_FOLLOW_TOP, 0); B_FOLLOW_LEFT | B_FOLLOW_TOP, 0);