← Back to branch summary

~mc-return/nux/nux.merge-fix-deprecated-warnings

« back to all changes in this revision

Viewing changes to Nux/HScrollBar.cpp

* Refactoring Nux timer API: Some cleanup and update were required for the animation framework.. Fixes: . Approved by Jay Taoko.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Nux/HScrollBar.cpp
90
90
    hlayout->AddView(_scroll_right_button, 0, eCenter, eFix);
91
91
 
92
92
    callback = new TimerFunctor;
93
 
    callback->time_expires.connect(sigc::mem_fun(this, &HScrollBar::HScrollBarHandler));
 
93
    callback->tick.connect(sigc::mem_fun(this, &HScrollBar::HScrollBarHandler));
94
94
    left_callback = new TimerFunctor;
95
 
    left_callback->time_expires.connect(sigc::mem_fun(this, &HScrollBar::ScrollLeft));
 
95
    left_callback->tick.connect(sigc::mem_fun(this, &HScrollBar::ScrollLeft));
96
96
    right_callback = new TimerFunctor;
97
 
    right_callback->time_expires.connect(sigc::mem_fun(this, &HScrollBar::ScrollRight));
 
97
    right_callback->tick.connect(sigc::mem_fun(this, &HScrollBar::ScrollRight));
98
98
    trackleft_callback = new TimerFunctor;
99
 
    trackleft_callback->time_expires.connect(sigc::mem_fun(this, &HScrollBar::TrackLeft));
 
99
    trackleft_callback->tick.connect(sigc::mem_fun(this, &HScrollBar::TrackLeft));
100
100
    trackright_callback = new TimerFunctor;
101
 
    trackright_callback->time_expires.connect(sigc::mem_fun(this, &HScrollBar::TrackRight));
 
101
    trackright_callback->tick.connect(sigc::mem_fun(this, &HScrollBar::TrackRight));
102
102
 
103
103
    SetLayout(hlayout);
104
104
    SetAcceptMouseWheelEvent(true);
130
130
      else
131
131
      {
132
132
        scrollbar->QueueDraw();
133
 
        GetTimer().AddTimerHandler(10, callback, scrollbar);
 
133
        GetTimer().AddOneShotTimer(10, callback, scrollbar);
134
134
      }
135
135
    }
136
136
 
146
146
      else
147
147
      {
148
148
        scrollbar->QueueDraw();
149
 
        GetTimer().AddTimerHandler(10, callback, scrollbar);
 
149
        GetTimer().AddOneShotTimer(10, callback, scrollbar);
150
150
      }
151
151
    }
152
152
  }
158
158
    if (AtMaximum())
159
159
      RecvEndScrollRight(0, 0, 0, 0);
160
160
    else
161
 
      m_RightTimerHandler = GetTimer().AddTimerHandler(10, right_callback, this);
 
161
      m_RightTimerHandler = GetTimer().AddOneShotTimer(10, right_callback, this);
162
162
 
163
163
    QueueDraw();
164
164
  }
170
170
    if (AtMaximum())
171
171
      RecvEndScrollLeft(0, 0, 0, 0);
172
172
    else
173
 
      m_LeftTimerHandler = GetTimer().AddTimerHandler(10, left_callback, this);
 
173
      m_LeftTimerHandler = GetTimer().AddOneShotTimer(10, left_callback, this);
174
174
 
175
175
    QueueDraw();
176
176
  }
180
180
    if (m_TrackMouseCoord.x < _slider->GetBaseX() - _track->GetBaseX())
181
181
    {
182
182
      OnScrollLeft.emit(container_width_, 1);
183
 
      m_TrackLeftTimerHandler  = GetTimer().AddTimerHandler(10, trackleft_callback, this);
 
183
      m_TrackLeftTimerHandler  = GetTimer().AddOneShotTimer(10, trackleft_callback, this);
184
184
      QueueDraw();
185
185
    }
186
186
  }
190
190
    if (m_TrackMouseCoord.x > _slider->GetBaseX() + _slider->GetBaseWidth() - _track->GetBaseX())
191
191
    {
192
192
      OnScrollRight.emit(container_width_, 1);
193
 
      m_TrackRightTimerHandler  = GetTimer().AddTimerHandler(10, trackright_callback, this);
 
193
      m_TrackRightTimerHandler  = GetTimer().AddOneShotTimer(10, trackright_callback, this);
194
194
      QueueDraw();
195
195
    }
196
196
  }
377
377
    //sigVScrollBarSliderMouseDown.emit();
378
378
    b_MouseDownTimer = true;
379
379
    b_MouseUpTimer = false;
380
 
    GetTimer().AddTimerHandler(10, callback, this);
 
380
    GetTimer().AddOneShotTimer(10, callback, this);
381
381
  }
382
382
 
383
383
  void HScrollBar::OnSliderMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags)
384
384
  {
385
385
    b_MouseDownTimer = false;
386
386
    b_MouseUpTimer = true;
387
 
    GetTimer().AddTimerHandler(10, callback, this);
 
387
    GetTimer().AddOneShotTimer(10, callback, this);
388
388
  }
389
389
 
390
390
  void HScrollBar::OnSliderMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)