← Back to branch summary

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

« back to all changes in this revision

Viewing changes to Nux/TabView.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/TabView.cpp
123
123
 
124
124
 
125
125
    tabright_callback = new TimerFunctor;
126
 
    tabright_callback->time_expires.connect(sigc::mem_fun(this, &TabView::RecvTabRightTimerExpired));
 
126
    tabright_callback->tick.connect(sigc::mem_fun(this, &TabView::RecvTabRightTimerExpired));
127
127
    tableft_callback = new TimerFunctor;
128
 
    tableft_callback->time_expires.connect(sigc::mem_fun(this, &TabView::RecvTabLeftTimerExpired));
 
128
    tableft_callback->tick.connect(sigc::mem_fun(this, &TabView::RecvTabLeftTimerExpired));
129
129
  }
130
130
 
131
131
  TabView::~TabView()
518
518
  void TabView::RecvTabRightTimerExpired(void *v)
519
519
  {
520
520
    TranslateTabLayout(-10);
521
 
    m_TabRightTimerHandler = GetTimer().AddTimerHandler(10, tabright_callback, this);
 
521
    m_TabRightTimerHandler = GetTimer().AddOneShotTimer(10, tabright_callback, this);
522
522
  }
523
523
 
524
524
  void TabView::RecvTabLeftTimerExpired(void *v)
525
525
  {
526
526
    TranslateTabLayout(10);
527
 
    m_TabLeftTimerHandler = GetTimer().AddTimerHandler(10, tableft_callback, this);
 
527
    m_TabLeftTimerHandler = GetTimer().AddOneShotTimer(10, tableft_callback, this);
528
528
  }
529
529
 
530
530
  bool TabView::AcceptKeyNavFocus()