diff --git a/core/src/labels/label.cpp b/core/src/labels/label.cpp index 66b2c35d4f..5b55831a12 100644 --- a/core/src/labels/label.cpp +++ b/core/src/labels/label.cpp @@ -254,13 +254,7 @@ bool Label::update(const glm::mat4& _mvp, const glm::vec2& _screenSize, float _z return false; } } else if (m_state == State::out_of_screen) { - if (m_occludedLastFrame) { - enterState(State::sleep, 0.0); - } else { - // Non-occluded out-of-screen label came into - // screen again. Skip fade-in transition. - enterState(State::visible, 1.0); - } + enterState(State::sleep, 0.0); } return true; diff --git a/tests/unit/labelTests.cpp b/tests/unit/labelTests.cpp index 5024a0bd34..f9a9ee6c8a 100644 --- a/tests/unit/labelTests.cpp +++ b/tests/unit/labelTests.cpp @@ -102,7 +102,7 @@ TEST_CASE( "Ensure the out of screen state transition", "[Core][Label]" ) { l.evalState(0); REQUIRE(l.state() != Label::State::none); - REQUIRE(l.state() == Label::State::visible); + REQUIRE(l.state() == Label::State::fading_in); REQUIRE(l.canOcclude()); }