Skip to content

Commit

Permalink
fixing regression where gui spindial values were limited to integer (…
Browse files Browse the repository at this point in the history
…from [16230]) refs #36

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk/sumo@16518 afbd958f-9f77-42d5-a016-97a22340ccf4
  • Loading branch information
namdre committed Jun 4, 2014
1 parent 7a34d87 commit 1440605
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/utils/foxtools/FXRealSpinDial.cpp
Expand Up @@ -462,7 +462,8 @@ FXRealSpinDial::FXRealSpinDial(FXComposite* p, FXint cols, FXObject* tgt, FXSele
upButton = new FXRealSpinDialBtn(this, this, ID_INCREMENT, FRAME_RAISED | FRAME_THICK | ARROW_UP | ARROW_REPEAT, 0, 0, 0, 0, 0, 0, 0, 0);
downButton = new FXRealSpinDialBtn(this, this, ID_DECREMENT, FRAME_RAISED | FRAME_THICK | ARROW_DOWN | ARROW_REPEAT, 0, 0, 0, 0, 0, 0, 0, 0);
// flag SPINDIAL_NOMAX collides with flag TEXTFIELD_PASSWORD
textField = new FXRealSpinDialText(this, cols, this, ID_ENTRY, (opts & ~SPINDIAL_NOMAX) | TEXTFIELD_REAL | JUSTIFY_RIGHT, 0, 0, 0, 0, pl, pr, pt, pb);
// flag SPINDIAL_NOMIN collides with flag TEXTFIELD_INTEGER
textField = new FXRealSpinDialText(this, cols, this, ID_ENTRY, (opts & ~(SPINDIAL_NOMAX | SPINDIAL_NOMIN)) | TEXTFIELD_REAL | JUSTIFY_RIGHT, 0, 0, 0, 0, pl, pr, pt, pb);
textField->setText("0");
range[0] = (options & SPINDIAL_NOMIN) ? -DBL_MAX : 0;
range[1] = (options & SPINDIAL_NOMAX) ? DBL_MAX : 100;
Expand Down

0 comments on commit 1440605

Please sign in to comment.