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

Automatic trailing whitespace removal.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33929 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-11-07 08:21:14 +00:00
parent d0b21f13dd
commit 4914357d9d
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Slider.cpp
+10 -10
View File
@@ -27,7 +27,7 @@
#include <binary_compatibility/Interface.h> #include <binary_compatibility/Interface.h>
#define USE_OFF_SCREEN_VIEW 1 #define USE_OFF_SCREEN_VIEW 1
BSlider::BSlider(BRect frame, const char* name, const char* label, BSlider::BSlider(BRect frame, const char* name, const char* label,
@@ -89,7 +89,7 @@ BSlider::BSlider(BRect frame, const char *name, const char *label,
} }
BSlider::BSlider(const char *name, const char *label, BMessage *message, BSlider::BSlider(const char *name, const char *label, BMessage *message,
int32 minValue, int32 maxValue, orientation posture, int32 minValue, int32 maxValue, orientation posture,
thumb_style thumbType, uint32 flags) thumb_style thumbType, uint32 flags)
: BControl(name, label, message, flags), : BControl(name, label, message, flags),
@@ -127,7 +127,7 @@ BSlider::BSlider(BMessage *archive)
BMessage* message = new BMessage; BMessage* message = new BMessage;
archive->FindMessage("_mod_msg", message); archive->FindMessage("_mod_msg", message);
SetModificationMessage(message); SetModificationMessage(message);
} }
@@ -284,7 +284,7 @@ BSlider::Archive(BMessage *archive, bool deep) const
ret = archive->AddInt32("_hashcount", fHashMarkCount); ret = archive->AddInt32("_hashcount", fHashMarkCount);
if (ret == B_OK) if (ret == B_OK)
ret = archive->AddInt16("_hashloc", fHashMarks); ret = archive->AddInt16("_hashloc", fHashMarks);
if (ret == B_OK) if (ret == B_OK)
ret = archive->AddInt16("_sstyle", fStyle); ret = archive->AddInt16("_sstyle", fStyle);
if (ret == B_OK) if (ret == B_OK)
ret = archive->AddInt32("_orient", fOrientation); ret = archive->AddInt32("_orient", fOrientation);
@@ -460,7 +460,7 @@ BSlider::FrameResized(float w,float h)
delete fOffScreenBits; delete fOffScreenBits;
fOffScreenView->ResizeTo(bounds.Width(), bounds.Height()); fOffScreenView->ResizeTo(bounds.Width(), bounds.Height());
fOffScreenBits = new BBitmap(Bounds(), B_RGBA32, true, false); fOffScreenBits = new BBitmap(Bounds(), B_RGBA32, true, false);
fOffScreenBits->AddChild(fOffScreenView); fOffScreenBits->AddChild(fOffScreenView);
} }
@@ -855,7 +855,7 @@ BSlider::DrawSlider()
#if USE_OFF_SCREEN_VIEW #if USE_OFF_SCREEN_VIEW
fOffScreenView->Sync(); fOffScreenView->Sync();
fOffScreenBits->Unlock(); fOffScreenBits->Unlock();
DrawBitmap(fOffScreenBits, B_ORIGIN); DrawBitmap(fOffScreenBits, B_ORIGIN);
} }
#endif #endif
@@ -1646,7 +1646,7 @@ BSlider::SetLimits(int32 minimum, int32 maximum)
if (minimum <= maximum) { if (minimum <= maximum) {
fMinValue = minimum; fMinValue = minimum;
fMaxValue = maximum; fMaxValue = maximum;
int32 value = Value(); int32 value = Value();
value = max_c(minimum, value); value = max_c(minimum, value);
value = min_c(maximum, value); value = min_c(maximum, value);
@@ -1699,7 +1699,7 @@ BSize
BSlider::MaxSize() BSlider::MaxSize()
{ {
BSize maxSize = _ValidateMinSize(); BSize maxSize = _ValidateMinSize();
if (fOrientation == B_HORIZONTAL) if (fOrientation == B_HORIZONTAL)
maxSize.width = B_SIZE_UNLIMITED; maxSize.width = B_SIZE_UNLIMITED;
else else
maxSize.height = B_SIZE_UNLIMITED; maxSize.height = B_SIZE_UNLIMITED;
@@ -1711,7 +1711,7 @@ BSize
BSlider::PreferredSize() BSlider::PreferredSize()
{ {
BSize preferredSize = _ValidateMinSize(); BSize preferredSize = _ValidateMinSize();
if (fOrientation == B_HORIZONTAL) if (fOrientation == B_HORIZONTAL)
preferredSize.width = max_c(100.0, preferredSize.width); preferredSize.width = max_c(100.0, preferredSize.width);
else else
preferredSize.height = max_c(100.0, preferredSize.height); preferredSize.height = max_c(100.0, preferredSize.height);
@@ -2053,7 +2053,7 @@ BSlider::_ValidateMinSize()
height += rows * (ceilf(fontHeight.ascent) height += rows * (ceilf(fontHeight.ascent)
+ ceilf(fontHeight.descent) + 4.0); + ceilf(fontHeight.descent) + 4.0);
} else { } else {
// B_VERTICAL // B_VERTICAL
width = 12.0 + fBarThickness; width = 12.0 + fBarThickness;
height = 32.0; height = 32.0;