openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-27 17:21:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build full array value when height is zero

Browse Source 
Signed-off-by: Zhang-Dong-hui <zhangdonghui5@huawei.com>
Change-Id: Idb3e9a2c2860bbe00f870a7343248f8723e472ed
This commit is contained in:
Zhang-Dong-hui 2024-08-05 09:23:16 +00:00
parent 446ee1b5a3
commit 1353191057
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frameworks/core/components_ng/pattern/indexer/indexer_pattern.cpp
View File

@ -250,7 +250,8 @@ void IndexerPattern::CollapseArrayValue()
maxItemsCount = static_cast<int32_t>(height / itemSize);
}
int32_t fullArraySize = static_cast<int32_t>(fullArrayValue_.size());
if (maxItemsCount >= fullArraySize || fullArraySize - sharpItemCount_ <= INDEXER_NINE_CHARACTERS_CHECK) {
if (NearZero(height) || maxItemsCount >= fullArraySize ||
fullArraySize - sharpItemCount_ <= INDEXER_NINE_CHARACTERS_CHECK) {
if (lastCollapsingMode_ != IndexerCollapsingMode::NONE) {
lastCollapsingMode_ = IndexerCollapsingMode::NONE;
BuildFullArrayValue();

30
test/unittest/core/pattern/indexer/indexer_model_test_ng.cpp
View File

@ -37,7 +37,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone009, TestSize.Level1)
{
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(6, DimensionUnit::FP));
model.SetItemSize(Dimension(16, DimensionUnit::FP));
CreateDone();
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
@ -54,6 +54,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone009, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
@ -85,7 +86,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0010, TestSize.Level1)
{
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(6, DimensionUnit::PX));
model.SetItemSize(Dimension(16, DimensionUnit::PX));
CreateDone();
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
@ -101,6 +102,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0010, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
arrayValueRst.push_back(std::pair("B", true));
@ -148,6 +150,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0011, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
@ -178,7 +181,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0012, TestSize.Level1)
{
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(6, DimensionUnit::LPX));
model.SetItemSize(Dimension(16, DimensionUnit::LPX));
CreateDone();
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
@ -195,6 +198,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0012, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
@ -243,6 +247,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0013, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
@ -274,7 +279,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0014, TestSize.Level1)
{
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(9, DimensionUnit::FP));
model.SetItemSize(Dimension(19, DimensionUnit::FP));
CreateDone();
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
@ -291,6 +296,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0014, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
@ -322,7 +328,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0015, TestSize.Level1)
{
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(9, DimensionUnit::PX));
model.SetItemSize(Dimension(19, DimensionUnit::PX));
CreateDone();
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
@ -339,6 +345,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0015, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
@ -387,6 +394,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0016, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
@ -417,7 +425,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0017, TestSize.Level1)
{
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(9, DimensionUnit::LPX));
model.SetItemSize(Dimension(19, DimensionUnit::LPX));
CreateDone();
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
@ -434,6 +442,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0017, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
@ -465,7 +474,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0018, TestSize.Level1)
{
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(9, DimensionUnit::NONE));
model.SetItemSize(Dimension(19, DimensionUnit::NONE));
CreateDone();
RefPtr<GeometryNode> geometryNode = AceType::MakeRefPtr<GeometryNode>();
RefPtr<LayoutWrapperNode> layoutWrapper =
@ -480,6 +489,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0018, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("A", false));
arrayValueRst.push_back(std::pair("B", true));
@ -659,6 +669,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0025, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("#", false));
@ -709,6 +720,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0026, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("#", false));
@ -759,6 +771,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0027, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("#", false));
@ -809,6 +822,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0028, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("#", false));
@ -860,6 +874,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0029, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("#", false));
@ -910,6 +925,7 @@ HWTEST_F(IndexerModelTestNg, OnModifyDone0030, TestSize.Level1)
dirtySwapConfig.skipMeasure = false;
dirtySwapConfig.skipLayout = false;
pattern_->OnDirtyLayoutWrapperSwap(layoutWrapper, dirtySwapConfig);
pattern_->OnModifyDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
arrayValueRst.push_back(std::pair("#", false));

12
test/unittest/core/pattern/indexer/indexer_test_ng.cpp
View File

@ -225,13 +225,13 @@ HWTEST_F(IndexerTestNg, IndexerTouch001, TestSize.Level1)
* @tc.expected: Selected index is correct.
*/
pattern_->OnHover(true);
// EXPECT_TRUE(Touch(TouchType::DOWN, 50.f, static_cast<int32_t>(50.f / pattern_->itemHeight_)));
EXPECT_TRUE(Touch(TouchType::DOWN, 50.f, static_cast<int32_t>(50.f / pattern_->itemHeight_)));
/**
* @tc.steps: step2. OnTouchUp, different location.
* @tc.expected: Selected index is correct.
*/
// EXPECT_TRUE(Touch(TouchType::UP, 20.f, static_cast<int32_t>(50.f / pattern_->itemHeight_)));
EXPECT_TRUE(Touch(TouchType::UP, 20.f, static_cast<int32_t>(50.f / pattern_->itemHeight_)));
}
/**
@ -251,13 +251,13 @@ HWTEST_F(IndexerTestNg, IndexerTouch002, TestSize.Level1)
* @tc.expected: Selected index is correct.
*/
pattern_->OnHover(false);
// EXPECT_TRUE(Touch(TouchType::DOWN, 50.f, static_cast<int32_t>(50.f / pattern_->itemHeight_)));
EXPECT_TRUE(Touch(TouchType::DOWN, 50.f, static_cast<int32_t>(50.f / pattern_->itemHeight_)));
/**
* @tc.steps: step2. OnTouchUp, same location.
* @tc.expected: Selected index is correct.
*/
// EXPECT_TRUE(Touch(TouchType::UP, 50.f, static_cast<int32_t>(50.f / pattern_->itemHeight_)));
EXPECT_TRUE(Touch(TouchType::UP, 50.f, static_cast<int32_t>(50.f / pattern_->itemHeight_)));
}
/**
@ -1226,6 +1226,7 @@ HWTEST_F(IndexerTestNg, OnModifyDone003, TestSize.Level1)
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(10, DimensionUnit::VP));
pattern_->maxContentHeight_ = 100.f;
CreateDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
@ -1259,6 +1260,7 @@ HWTEST_F(IndexerTestNg, OnModifyDone004, TestSize.Level1)
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(6, DimensionUnit::VP));
pattern_->maxContentHeight_ = 60.f;
CreateDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
@ -1292,6 +1294,7 @@ HWTEST_F(IndexerTestNg, OnModifyDone005, TestSize.Level1)
IndexerModelNG model = CreateIndexer(CREATE_ARRAY, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(2000, DimensionUnit::VP));
pattern_->maxContentHeight_ = 100.f;
CreateDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;
@ -1369,6 +1372,7 @@ HWTEST_F(IndexerTestNg, OnModifyDone008, TestSize.Level1)
IndexerModelNG model = CreateIndexer(CREATE_ARRAY_2, 0);
model.SetAutoCollapse(true);
model.SetItemSize(Dimension(10, DimensionUnit::VP));
pattern_->maxContentHeight_ = 100.f;
CreateDone();
std::vector<std::pair<std::string, bool>> arrayValueRst;