openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-10-07 08:24:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!44133 挑单5.0release——点击两次子页签背板颜色才改变

Browse Source 
Merge pull request !44133 from yangcan/5.0release
This commit is contained in:
openharmony_ci 2024-09-23 11:26:28 +00:00 committed by Gitee
commit 372f1771b9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
frameworks/core/components_ng/pattern/tabs/tab_bar_pattern.cpp
View File

@ -1949,8 +1949,6 @@ void TabBarPattern::UpdateSubTabBoard(int32_t index)
}
auto tabBarNode = GetHost();
CHECK_NULL_VOID(tabBarNode);
auto paintProperty = GetPaintProperty<TabBarPaintProperty>();
CHECK_NULL_VOID(paintProperty);
auto columnNode = DynamicCast<FrameNode>(tabBarNode->GetChildAtIndex(index));
CHECK_NULL_VOID(columnNode);
auto selectedColumnId = columnNode->GetId();
@ -1967,11 +1965,13 @@ void TabBarPattern::UpdateSubTabBoard(int32_t index)
CHECK_NULL_VOID(columnFrameNode);
auto renderContext = columnFrameNode->GetRenderContext();
CHECK_NULL_VOID(renderContext);
if (tabBarStyles_[iter.first] == TabBarStyle::SUBTABBATSTYLE) {
auto textNode = AceType::DynamicCast<FrameNode>(columnFrameNode->GetChildren().back());
CHECK_NULL_VOID(textNode);
auto textLayoutProperty = textNode->GetLayoutProperty<TextLayoutProperty>();
CHECK_NULL_VOID(textLayoutProperty);
if (tabBarStyles_[iter.first] != TabBarStyle::SUBTABBATSTYLE) {
continue;
}
auto textNode = AceType::DynamicCast<FrameNode>(columnFrameNode->GetChildren().back());
CHECK_NULL_VOID(textNode);
auto textLayoutProperty = textNode->GetLayoutProperty<TextLayoutProperty>();
if (textLayoutProperty) {
if (GreatOrEqual(fontscale, bigScale_) && LessOrEqual(fontscale, largeScale_)) {
textLayoutProperty->UpdateMargin(marginLeftOrRight_);
} else if (GreatOrEqual(fontscale, largeScale_) && LessOrEqual(fontscale, maxScale_)) {
@ -1979,14 +1979,14 @@ void TabBarPattern::UpdateSubTabBoard(int32_t index)
} else {
textLayoutProperty->UpdateMargin(marginTopOrBottom_);
}
if (selectedModes_[index] == SelectedMode::BOARD && columnFrameNode->GetId() == selectedColumnId &&
axis == Axis::HORIZONTAL) {
renderContext->UpdateBackgroundColor(indicatorStyles_[index].color);
} else {
renderContext->UpdateBackgroundColor(Color::BLACK.BlendOpacity(0.0f));
}
columnFrameNode->MarkDirtyNode(PROPERTY_UPDATE_RENDER);
}
if (selectedModes_[index] == SelectedMode::BOARD && columnFrameNode->GetId() == selectedColumnId &&
axis == Axis::HORIZONTAL) {
renderContext->UpdateBackgroundColor(indicatorStyles_[index].color);
} else {
renderContext->UpdateBackgroundColor(Color::BLACK.BlendOpacity(0.0f));
}
columnFrameNode->MarkDirtyNode(PROPERTY_UPDATE_RENDER);
}
}