Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whitespace cleanup. No functional changes.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@25940 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz 2008-06-12 18:08:52 +00:00
parent 12f3292615
commit 3ba76c1433
2 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/servers/app/DefaultDecorator.cpp
View File

@ -123,7 +123,7 @@ DefaultDecorator::SetTitle(const char* string, BRegion* updateRegion)
BRect rect = TabRect(); BRect rect = TabRect();
Decorator::SetTitle(string); Decorator::SetTitle(string);
if (updateRegion == NULL) if (updateRegion == NULL)
return; return;
@ -210,7 +210,7 @@ DefaultDecorator::MoveBy(BPoint pt)
fResizeRect.OffsetBy(pt); fResizeRect.OffsetBy(pt);
fZoomRect.OffsetBy(pt); fZoomRect.OffsetBy(pt);
fBorderRect.OffsetBy(pt); fBorderRect.OffsetBy(pt);
fLeftBorder.OffsetBy(pt); fLeftBorder.OffsetBy(pt);
fRightBorder.OffsetBy(pt); fRightBorder.OffsetBy(pt);
fTopBorder.OffsetBy(pt); fTopBorder.OffsetBy(pt);
@ -243,7 +243,7 @@ DefaultDecorator::ResizeBy(BPoint pt, BRegion* dirty)
case B_MODAL_WINDOW_LOOK: case B_MODAL_WINDOW_LOOK:
case kLeftTitledWindowLook: case kLeftTitledWindowLook:
realResizeRect.Set(fRightBorder.right - 22, fBottomBorder.top, realResizeRect.Set(fRightBorder.right - 22, fBottomBorder.top,
fRightBorder.right - 22, fBottomBorder.bottom - 1); fRightBorder.right - 22, fBottomBorder.bottom - 1);
// resize rect at old location // resize rect at old location
dirty->Include(realResizeRect); dirty->Include(realResizeRect);
realResizeRect.OffsetBy(pt); realResizeRect.OffsetBy(pt);
@ -251,7 +251,7 @@ DefaultDecorator::ResizeBy(BPoint pt, BRegion* dirty)
dirty->Include(realResizeRect); dirty->Include(realResizeRect);
realResizeRect.Set(fRightBorder.left, fBottomBorder.bottom - 22, realResizeRect.Set(fRightBorder.left, fBottomBorder.bottom - 22,
fRightBorder.right - 1, fBottomBorder.bottom - 22); fRightBorder.right - 1, fBottomBorder.bottom - 22);
// resize rect at old location // resize rect at old location
dirty->Include(realResizeRect); dirty->Include(realResizeRect);
realResizeRect.OffsetBy(pt); realResizeRect.OffsetBy(pt);
@ -267,13 +267,13 @@ DefaultDecorator::ResizeBy(BPoint pt, BRegion* dirty)
fBorderRect.right += pt.x; fBorderRect.right += pt.x;
fBorderRect.bottom += pt.y; fBorderRect.bottom += pt.y;
fLeftBorder.bottom += pt.y; fLeftBorder.bottom += pt.y;
fTopBorder.right += pt.x; fTopBorder.right += pt.x;
fRightBorder.OffsetBy(pt.x, 0.0); fRightBorder.OffsetBy(pt.x, 0.0);
fRightBorder.bottom += pt.y; fRightBorder.bottom += pt.y;
fBottomBorder.OffsetBy(0.0, pt.y); fBottomBorder.OffsetBy(0.0, pt.y);
fBottomBorder.right += pt.x; fBottomBorder.right += pt.x;
@ -283,19 +283,19 @@ DefaultDecorator::ResizeBy(BPoint pt, BRegion* dirty)
fRightBorder.right, fTopBorder.bottom); fRightBorder.right, fTopBorder.bottom);
dirty->Include(t); dirty->Include(t);
t.Set(fRightBorder.left - pt.x, fBottomBorder.top, t.Set(fRightBorder.left - pt.x, fBottomBorder.top,
fRightBorder.right, fBottomBorder.bottom); fRightBorder.right, fBottomBorder.bottom);
dirty->Include(t); dirty->Include(t);
dirty->Include(fRightBorder); dirty->Include(fRightBorder);
} else if (pt.x < 0.0) { } else if (pt.x < 0.0) {
dirty->Include(BRect(fRightBorder.left, fTopBorder.top, dirty->Include(BRect(fRightBorder.left, fTopBorder.top,
fRightBorder.right, fBottomBorder.bottom)); fRightBorder.right, fBottomBorder.bottom));
} }
if (pt.y > 0.0) { if (pt.y > 0.0) {
BRect t(fLeftBorder.left, fLeftBorder.bottom - pt.y, BRect t(fLeftBorder.left, fLeftBorder.bottom - pt.y,
fLeftBorder.right, fLeftBorder.bottom); fLeftBorder.right, fLeftBorder.bottom);
dirty->Include(t); dirty->Include(t);
t.Set(fRightBorder.left, fRightBorder.bottom - pt.y, t.Set(fRightBorder.left, fRightBorder.bottom - pt.y,
fRightBorder.right, fRightBorder.bottom); fRightBorder.right, fRightBorder.bottom);
dirty->Include(t); dirty->Include(t);
dirty->Include(fBottomBorder); dirty->Include(fBottomBorder);
} else if (pt.y < 0.0) { } else if (pt.y < 0.0) {
@ -478,7 +478,7 @@ DefaultDecorator::GetFootprint(BRegion *region)
region->Include(fLeftBorder); region->Include(fLeftBorder);
region->Include(fRightBorder); region->Include(fRightBorder);
region->Include(fBottomBorder); region->Include(fBottomBorder);
if (fLook == B_BORDERED_WINDOW_LOOK) if (fLook == B_BORDERED_WINDOW_LOOK)
return; return;
@ -540,7 +540,7 @@ DefaultDecorator::Clicked(BPoint pt, int32 buttons, int32 modifiers)
|| fLook == B_MODAL_WINDOW_LOOK || fLook == B_MODAL_WINDOW_LOOK
|| fLook == kLeftTitledWindowLook)) { || fLook == kLeftTitledWindowLook)) {
BRect temp(BPoint(fBottomBorder.right - 18, fBottomBorder.bottom - 18), BRect temp(BPoint(fBottomBorder.right - 18, fBottomBorder.bottom - 18),
fBottomBorder.RightBottom()); fBottomBorder.RightBottom());
if (temp.Contains(pt)) if (temp.Contains(pt))
return DEC_RESIZE; return DEC_RESIZE;
} }
@ -775,7 +775,7 @@ DefaultDecorator::_DrawFrame(BRect invalid)
} }
break; break;
} }
case B_FLOATING_WINDOW_LOOK: case B_FLOATING_WINDOW_LOOK:
case kLeftTitledWindowLook: case kLeftTitledWindowLook:
{ {
@ -884,7 +884,7 @@ DefaultDecorator::_DrawFrame(BRect invalid)
fBottomBorder.bottom - 22, fRightBorder.right - 1, fBottomBorder.bottom - 22, fRightBorder.right - 1,
fBottomBorder.bottom - 1))) fBottomBorder.bottom - 1)))
break; break;
fDrawingEngine->StrokeLine( fDrawingEngine->StrokeLine(
BPoint(fRightBorder.left, fBottomBorder.bottom - 22), BPoint(fRightBorder.left, fBottomBorder.bottom - 22),
BPoint(fRightBorder.right - 1, fBottomBorder.bottom - 22), BPoint(fRightBorder.right - 1, fBottomBorder.bottom - 22),
@ -957,7 +957,7 @@ DefaultDecorator::_DrawTab(BRect invalid)
_DrawTitle(fTabRect); _DrawTitle(fTabRect);
// Draw the buttons if we're supposed to // Draw the buttons if we're supposed to
if (!(fFlags & B_NOT_CLOSABLE) && invalid.Intersects(fCloseRect)) if (!(fFlags & B_NOT_CLOSABLE) && invalid.Intersects(fCloseRect))
_DrawClose(fCloseRect); _DrawClose(fCloseRect);
if (!(fFlags & B_NOT_ZOOMABLE) && invalid.Intersects(fZoomRect)) if (!(fFlags & B_NOT_ZOOMABLE) && invalid.Intersects(fZoomRect))
@ -1033,7 +1033,7 @@ DefaultDecorator::_SetFocus()
{ {
// SetFocus() performs necessary duties for color swapping and // SetFocus() performs necessary duties for color swapping and
// other things when a window is deactivated or activated. // other things when a window is deactivated or activated.
if (IsFocus() if (IsFocus()
|| ((fLook == B_FLOATING_WINDOW_LOOK || fLook == kLeftTitledWindowLook) || ((fLook == B_FLOATING_WINDOW_LOOK || fLook == kLeftTitledWindowLook)
&& (fFlags & B_AVOID_FOCUS) != 0)) { && (fFlags & B_AVOID_FOCUS) != 0)) {
@ -1103,7 +1103,7 @@ DefaultDecorator::_DrawBlendedRect(BRect r, bool down)
tempColor.red = uint8(startColor.red - (i * rstep)); tempColor.red = uint8(startColor.red - (i * rstep));
tempColor.green = uint8(startColor.green - (i * gstep)); tempColor.green = uint8(startColor.green - (i * gstep));
tempColor.blue = uint8(startColor.blue - (i * bstep)); tempColor.blue = uint8(startColor.blue - (i * bstep));
fDrawingEngine->StrokeLine(BPoint(r.left, r.top + i), fDrawingEngine->StrokeLine(BPoint(r.left, r.top + i),
BPoint(r.left + i, r.top), tempColor); BPoint(r.left + i, r.top), tempColor);

10
src/servers/app/DefaultDecorator.h
View File

@ -82,25 +82,25 @@ class DefaultDecorator: public Decorator {
rgb_color fTabColorShadow; rgb_color fTabColorShadow;
rgb_color fFrameColors[6]; rgb_color fFrameColors[6];
// Individual rects for handling window frame // Individual rects for handling window frame
// rendering the proper way // rendering the proper way
BRect fRightBorder; BRect fRightBorder;
BRect fLeftBorder; BRect fLeftBorder;
BRect fTopBorder; BRect fTopBorder;
BRect fBottomBorder; BRect fBottomBorder;
int32 fBorderWidth; int32 fBorderWidth;
uint32 fTabOffset; uint32 fTabOffset;
float fTabLocation; float fTabLocation;
float fTextOffset; float fTextOffset;
float fMinTabSize; float fMinTabSize;
float fMaxTabSize; float fMaxTabSize;
BString fTruncatedTitle; BString fTruncatedTitle;
int32 fTruncatedTitleLength; int32 fTruncatedTitleLength;
bigtime_t fLastClicked; bigtime_t fLastClicked;
bool fWasDoubleClick; bool fWasDoubleClick;
}; };