hrev50866 adds 3 changesets to branch 'master'
old head: bdd02e0d9d4ff4be6c80aeb799a93692467381dc
new head: 26d416448112acac341d8a7c71344cba3c8a6814
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=26d416448112+%5Ebdd02e0d9d4f
----------------------------------------------------------------------------
3705d40cd93d: BSpinner: Set min value then max value
... 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.
5973288e1160: BSpinner: Fix copy-pasta bug, min=>min, max=>max
fMinValue was getting set to INT32_MAX then set to INT32_MIN
fMaxValue was not getting set
now set fMinValue to INT32_MIN, fMaxValue to INT32_MAX
also in _InitObject()
26d416448112: AbstractSpinner: Make TextView resizable
Fixes #13168
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
5 files changed, 36 insertions(+), 35 deletions(-)
headers/private/interface/DecimalSpinner.h | 6 +++---
headers/private/interface/Spinner.h | 6 +++---
src/kits/interface/AbstractSpinner.cpp | 1 +
src/kits/interface/DecimalSpinner.cpp | 28 ++++++++++++------------
src/kits/interface/Spinner.cpp | 30 +++++++++++++-------------
############################################################################
Commit: 3705d40cd93d8ddd93d031b279efff2e3eae807d
URL: http://cgit.haiku-os.org/haiku/commit/?id=3705d40cd93d
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Jan 12 21:42:23 2017 UTC
BSpinner: Set min value then max value
... 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.
----------------------------------------------------------------------------
diff --git a/headers/private/interface/DecimalSpinner.h
b/headers/private/interface/DecimalSpinner.h
index 9c97367..f6a787b 100644
--- a/headers/private/interface/DecimalSpinner.h
+++ b/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);
diff --git a/headers/private/interface/Spinner.h
b/headers/private/interface/Spinner.h
index e106ded..1516704 100644
--- a/headers/private/interface/Spinner.h
+++ b/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);
diff --git a/src/kits/interface/DecimalSpinner.cpp
b/src/kits/interface/DecimalSpinner.cpp
index e772b53..d1ef04e 100644
--- a/src/kits/interface/DecimalSpinner.cpp
+++ b/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);
@@ -246,20 +246,20 @@ BDecimalSpinner::SetEnabled(bool enable)
void
-BDecimalSpinner::SetMaxValue(double max)
+BDecimalSpinner::SetMinValue(double min)
{
- fMaxValue = max;
- if (fValue > fMaxValue)
- SetValue(fMaxValue);
+ fMinValue = min;
+ if (fValue < fMinValue)
+ SetValue(fMinValue);
}
void
-BDecimalSpinner::SetMinValue(double min)
+BDecimalSpinner::SetMaxValue(double max)
{
- fMinValue = min;
- if (fValue < fMinValue)
- SetValue(fMinValue);
+ fMaxValue = max;
+ if (fValue > fMaxValue)
+ SetValue(fMaxValue);
}
@@ -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;
diff --git a/src/kits/interface/Spinner.cpp b/src/kits/interface/Spinner.cpp
index e6d6a63..ba56f9d 100644
--- a/src/kits/interface/Spinner.cpp
+++ b/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);
@@ -194,20 +194,20 @@ BSpinner::SetEnabled(bool enable)
void
-BSpinner::SetMaxValue(int32 max)
+BSpinner::SetMinValue(int32 min)
{
- fMaxValue = max;
- if (fValue > fMaxValue)
- SetValue(fMaxValue);
+ fMinValue = min;
+ if (fValue < fMinValue)
+ SetValue(fMinValue);
}
void
-BSpinner::SetMinValue(int32 min)
+BSpinner::SetMaxValue(int32 max)
{
- fMinValue = min;
- if (fValue < fMinValue)
- SetValue(fMinValue);
+ fMaxValue = max;
+ if (fValue > fMaxValue)
+ SetValue(fMaxValue);
}
############################################################################
Commit: 5973288e1160c2347c28b25971feaf87eceb6598
URL: http://cgit.haiku-os.org/haiku/commit/?id=5973288e1160
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Jan 12 21:44:25 2017 UTC
BSpinner: Fix copy-pasta bug, min=>min, max=>max
fMinValue was getting set to INT32_MAX then set to INT32_MIN
fMaxValue was not getting set
now set fMinValue to INT32_MIN, fMaxValue to INT32_MAX
also in _InitObject()
----------------------------------------------------------------------------
diff --git a/src/kits/interface/Spinner.cpp b/src/kits/interface/Spinner.cpp
index ba56f9d..04e6dd1 100644
--- a/src/kits/interface/Spinner.cpp
+++ b/src/kits/interface/Spinner.cpp
@@ -100,12 +100,12 @@ BSpinner::BSpinner(BMessage* data)
{
_InitObject();
- if (data->FindInt32("_max", &fMaxValue) != B_OK)
- fMinValue = INT32_MAX;
-
if (data->FindInt32("_min", &fMinValue) != B_OK)
fMinValue = INT32_MIN;
+ if (data->FindInt32("_max", &fMaxValue) != B_OK)
+ fMaxValue = INT32_MAX;
+
if (data->FindInt32("_val", &fValue) != B_OK)
fValue = 0;
}
@@ -269,8 +269,8 @@ BSpinner::SetValueFromText()
void
BSpinner::_InitObject()
{
- fMaxValue = INT32_MIN;
- fMinValue = INT32_MAX;
+ fMinValue = INT32_MIN;
+ fMaxValue = INT32_MAX;
fValue = 0;
TextView()->SetAlignment(B_ALIGN_RIGHT);
############################################################################
Revision: hrev50866
Commit: 26d416448112acac341d8a7c71344cba3c8a6814
URL: http://cgit.haiku-os.org/haiku/commit/?id=26d416448112
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Jan 12 21:46:25 2017 UTC
Ticket: https://dev.haiku-os.org/ticket/13168
AbstractSpinner: Make TextView resizable
Fixes #13168
----------------------------------------------------------------------------
diff --git a/src/kits/interface/AbstractSpinner.cpp
b/src/kits/interface/AbstractSpinner.cpp
index d623960..a88bc41 100644
--- a/src/kits/interface/AbstractSpinner.cpp
+++ b/src/kits/interface/AbstractSpinner.cpp
@@ -532,6 +532,7 @@ SpinnerTextView::SpinnerTextView(BRect rect, BRect textRect)
B_WILL_DRAW | B_NAVIGABLE),
fParent(NULL)
{
+ MakeResizable(true);
}
