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

BSpinner: Set min value then max value

Browse Source 
... reverse this to avoid confusion, you'll see why in next commit.

No functional change intended in this commit, functional change is in the
next commit.
This commit is contained in:
John Scipione 2017-01-12 13:42:23 -08:00
parent bdd02e0d9d
commit 3705d40cd9
4 changed files with 32 additions and 32 deletions
headers/private/interface
DecimalSpinner.hSpinner.h
src/kits/interface
DecimalSpinner.cppSpinner.cpp

6
headers/private/interface/DecimalSpinner.h

@ -39,12 +39,12 @@ public:
uint32 Precision() const { return fPrecision; };
virtual void SetPrecision(uint32 precision) { fPrecision = precision; };
double MaxValue() const { return fMaxValue; }
virtual void SetMaxValue(double max);
double MinValue() const { return fMinValue; }
virtual void SetMinValue(double min);
double MaxValue() const { return fMaxValue; }
virtual void SetMaxValue(double max);
void Range(double* min, double* max);
virtual void SetRange(double min, double max);

6
headers/private/interface/Spinner.h

@ -36,12 +36,12 @@ public:
virtual void SetEnabled(bool enable);
int32 MaxValue() const { return fMaxValue; }
virtual void SetMaxValue(int32 max);
int32 MinValue() const { return fMinValue; }
virtual void SetMinValue(int32 min);
int32 MaxValue() const { return fMaxValue; }
virtual void SetMaxValue(int32 max);
void Range(int32* min, int32* max);
virtual void SetRange(int32 min, int32 max);

30
src/kits/interface/DecimalSpinner.cpp

@ -140,12 +140,12 @@ BDecimalSpinner::BDecimalSpinner(BMessage* data)
{
_InitObject();
if (data->FindDouble("_max", &fMaxValue) != B_OK)
fMinValue = 100.0;
if (data->FindDouble("_min", &fMinValue) != B_OK)
fMinValue = 0.0;
if (data->FindDouble("_max", &fMaxValue) != B_OK)
fMinValue = 100.0;
if (data->FindUInt32("_precision", &fPrecision) != B_OK)
fPrecision = 2;
@ -179,10 +179,10 @@ BDecimalSpinner::Archive(BMessage* data, bool deep) const
data->AddString("class", "DecimalSpinner");
if (status == B_OK)
status = data->AddDouble("_max", fMaxValue);
status = data->AddDouble("_min", fMinValue);
if (status == B_OK)
status = data->AddDouble("_min", fMinValue);
status = data->AddDouble("_max", fMaxValue);
if (status == B_OK)
status = data->AddUInt32("_precision", fPrecision);
@ -245,15 +245,6 @@ BDecimalSpinner::SetEnabled(bool enable)
}
void
BDecimalSpinner::SetMaxValue(double max)
{
fMaxValue = max;
if (fValue > fMaxValue)
SetValue(fMaxValue);
}
void
BDecimalSpinner::SetMinValue(double min)
{
@ -263,6 +254,15 @@ BDecimalSpinner::SetMinValue(double min)
}
void
BDecimalSpinner::SetMaxValue(double max)
{
fMaxValue = max;
if (fValue > fMaxValue)
SetValue(fMaxValue);
}
void
BDecimalSpinner::Range(double* min, double* max)
{
@ -332,8 +332,8 @@ BDecimalSpinner::SetValueFromText()
void
BDecimalSpinner::_InitObject()
{
fMaxValue = 100.0;
fMinValue = 0.0;
fMaxValue = 100.0;
fPrecision = 2;
fStep = 1.0;
fValue = 0.0;

22
src/kits/interface/Spinner.cpp

@ -133,10 +133,10 @@ BSpinner::Archive(BMessage* data, bool deep) const
data->AddString("class", "Spinner");
if (status == B_OK)
status = data->AddInt32("_max", fMaxValue);
status = data->AddInt32("_min", fMinValue);
if (status == B_OK)
status = data->AddInt32("_min", fMinValue);
status = data->AddInt32("_max", fMaxValue);
if (status == B_OK)
status = data->AddInt32("_val", fValue);
@ -193,15 +193,6 @@ BSpinner::SetEnabled(bool enable)
}
void
BSpinner::SetMaxValue(int32 max)
{
fMaxValue = max;
if (fValue > fMaxValue)
SetValue(fMaxValue);
}
void
BSpinner::SetMinValue(int32 min)
{
@ -211,6 +202,15 @@ BSpinner::SetMinValue(int32 min)
}
void
BSpinner::SetMaxValue(int32 max)
{
fMaxValue = max;
if (fValue > fMaxValue)
SetValue(fMaxValue);
}
void
BSpinner::Range(int32* min, int32* max)
{