fix text visibility (#679)

Author: Alex2772

aui.uitests/tests/UITextTest.cpp

@@ -13,6 +13,7 @@
 #include <AUI/Util/UIBuildingHelpers.h>
 #include <AUI/View/AText.h>
 #include <AUI/View/AScrollArea.h>
+#include <gmock/gmock.h>
 
 using namespace ass;
 using namespace declarative;
@@ -22,31 +23,18 @@ class UIText: public testing::UITest {
 public:
     ~UIText() override = default;
 
-protected:
-    void SetUp() override {
-        UITest::SetUp();
-
-
-        auto window = _new<AWindow>();
-        window->setContents(Centered {
-            mText
-        });
-        window->pack();
-        window->show();
-        uitest::frame();
-    }
-
-    _<AText> mText = AText::fromString("Привет мир\nвторая строка");
-
-
-    void TearDown() override {
-        UITest::TearDown();
-    }
 };
 
 
 TEST_F(UIText, Contents) {
-    auto& entries = mText->mEngine.entries();
+    auto window = _new<AWindow>();
+    auto text = AText::fromString("Привет мир\nвторая строка");
+    window->setContents(Centered {
+        text
+    });
+    window->pack();
+    window->show();
+    auto& entries = text->mEngine.entries();
     ASSERT_EQ(entries.size(), 7);
     EXPECT_EQ(AString::fromUtf32(_cast<AText::WordEntry>(entries[0])->getWord()), "Привет");
     EXPECT_NE(_cast<aui::detail::WhitespaceEntry>(entries[1]), nullptr);
@@ -56,3 +44,82 @@ TEST_F(UIText, Contents) {
     EXPECT_NE(_cast<aui::detail::WhitespaceEntry>(entries[5]), nullptr);
     EXPECT_EQ(AString::fromUtf32(_cast<aui::detail::WordEntry>(entries[6])->getWord()), "строка");
 }
+
+namespace {
+
+class ViewMock: public ALabel {
+public:
+    ViewMock(): ALabel("Test") {
+
+    }
+    void setPosition(glm::ivec2 position) override {
+        if (getPosition() == position) {
+            return;
+        }
+        ALabel::setPosition(position);
+        setPosition2(position.x, position.y);
+    }
+
+    MOCK_METHOD(void, setPosition2, (int x, int y));
+};
+}
+
+TEST_F(UIText, Basic) {
+    auto w = _new<AWindow>();
+    auto mock = _new<ViewMock>();
+
+    EXPECT_CALL(
+        *mock,
+        setPosition2(testing::AllOf(testing::Ge(25), testing::Le(35)), testing::AllOf(testing::Ge(0), testing::Le(5)))).Times(1);
+
+    w->setContents(Centered {
+        AText::fromItems({
+            "Hello", mock, "World", "Test"
+        }) AUI_OVERRIDE_STYLE {
+            FixedSize { 200_dp }
+        },
+    });
+    w->pack();
+    w->show();
+}
+
+TEST_F(UIText, Visibility) {
+    auto w = _new<AWindow>();
+    _<AView> label = Label { "Hello" };
+    auto mock = _new<ViewMock>();
+
+    testing::InSequence s;
+
+    EXPECT_CALL(
+        *mock,
+        setPosition2(testing::AllOf(testing::Ge(25), testing::Le(35)), testing::AllOf(testing::Ge(0), testing::Le(5)))).Times(1);
+
+    w->setContents(Centered {
+        AText::fromItems({
+            label, mock,
+        }) AUI_OVERRIDE_STYLE {
+            FixedSize { 200_dp }
+        },
+    });
+    w->pack();
+    w->show();
+
+    saveScreenshot("initial");
+
+    EXPECT_CALL(
+        *mock,
+        setPosition2(testing::AllOf(testing::Ge(0), testing::Le(5)), testing::AllOf(testing::Ge(0), testing::Le(5)))).Times(1);
+
+    label->setVisibility(Visibility::GONE);
+    uitest::frame();
+
+    saveScreenshot("label gone");
+
+    EXPECT_CALL(
+        *mock,
+        setPosition2(testing::AllOf(testing::Ge(25), testing::Le(35)), testing::AllOf(testing::Ge(0), testing::Le(5)))).Times(1);
+    label->setVisibility(Visibility::VISIBLE);
+    uitest::frame();
+
+    saveScreenshot("label visible");
+}

aui.views/src/AUI/View/ATextBase.h

@@ -306,6 +306,10 @@ class API_AUI_VIEWS ATextBase: public AViewContainerBase, public IFontView {
         mPrerenderedString = nullptr;
     }
 
+    void markMinContentSizeInvalid() override {
+        AViewContainerBase::markMinContentSizeInvalid();
+        mPrerenderedString = nullptr;
+    }
 
 protected:
     WordWrappingEngine mEngine;