github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-27 14:23:06 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: Initial value of Edit*Spin is now zero if Min limit is default; EditIntSpin and EditIntSpin64 now rounding values like EditDoubleSpin

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11049 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2017-05-01 14:53:39 +00:00
parent 61e73007ac
commit 7735fef5df
1 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
uppsrc/CtrlLib/EditCtrl.h
View file

@ -339,12 +339,30 @@ public:
template <class IncType> IncType WithSpin_DefaultIncValue() { return 1; }
template <> inline double WithSpin_DefaultIncValue() { return 0.1; }
template <class IncType> IncType WithSpin_DefaultStartValue() { return 0; }
template <> inline Date WithSpin_DefaultStartValue() { return GetSysDate(); }
template <> inline Time WithSpin_DefaultStartValue() { return GetSysTime(); }
template <class DataType, class IncType>
void WithSpin_Add(DataType& value, IncType inc, DataType min, bool roundfrommin)
{
value += inc;
}
template <> inline
void WithSpin_Add(int& value, int inc, int min, bool roundfrommin) {
if(roundfrommin)
value -= min;
if(inc < 0) {
inc = -inc;
value = (value - inc) / inc * inc;
}
else
value = (value + inc) / inc * inc;
if(roundfrommin)
value += min;
}
template <> inline
void WithSpin_Add(double& value, double inc, double min, bool roundfrommin) {
if(roundfrommin)
@ -447,7 +465,7 @@ void WithSpin<DataType, Base, IncType>::Inc()
else {
DataType min = Base::GetMin();
if(IsNull(min) || min <= Base::GetDefaultMin())
Base::SetData(0);
Base::SetData(WithSpin_DefaultStartValue<DataType>());
else
Base::SetData(min);
}
@ -472,7 +490,7 @@ void WithSpin<DataType, Base, IncType>::Dec()
else {
DataType max = Base::GetMax();
if(IsNull(max) || max >= Base::GetDefaultMax())
Base::SetData(0);
Base::SetData(WithSpin_DefaultStartValue<DataType>());
else
Base::SetData(max);
}