disable fade on fade_out->fade_in switch

- needs more thought, fade_in time must match the current alpha
tangrams · Aug 15, 2016 · e4f6e41 · e4f6e41
1 parent a87e38d
commit e4f6e41
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/core/src/labels/label.cpp b/core/src/labels/label.cpp
@@ -311,10 +311,12 @@ bool Label::evalState(float _dt) {
             return true;
 
         case State::fading_out:
-            if (!m_occluded) {
-                enterState(State::fading_in, m_transform.state.alpha);
-                return true;
-            }
+            // if (!m_occluded) {
+            //     enterState(State::fading_in, m_transform.state.alpha);
+            //     m_fade.reset(false, m_options.hideTransition.ease,
+            //                  m_options.showTransition.time);
+            //     return true;
+            // }
             setAlpha(m_fade.update(_dt));
             if (m_fade.isFinished()) {
                 enterState(State::sleep, 0.0);