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

!49157 [L] 窗口工具栏不适配深色模式取值问题

Browse Source 
Merge pull request !49157 from lisitao/l2
This commit is contained in:
openharmony_ci 2024-11-22 11:30:26 +00:00 committed by Gitee
commit 55b0314630
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
frameworks/core/components_ng/pattern/container_modal/container_modal_theme.h
View File

@ -19,6 +19,7 @@
#include <cstdint>
#include "base/utils/device_config.h"
#include "base/utils/system_properties.h"
#include "base/utils/utils.h"
#include "core/components/common/layout/constants.h"
#include "core/components/common/properties/color.h"
#include "core/components/common/properties/text_style.h"
@ -83,13 +84,15 @@ public:
if (!themeConstants) {
return theme;
}
ParsePattern(themeConstants->GetThemeStyle(), theme);
theme->themeConstants_ = themeConstants;
ParsePattern(themeConstants, theme);
return theme;
}
private:
void ParsePattern(const RefPtr<ThemeStyle>& themeStyle, const RefPtr<ContainerModalTheme>& theme) const
void ParsePattern(const RefPtr<ThemeConstants>& themeConstants, const RefPtr<ContainerModalTheme>& theme) const
{
auto themeStyle = themeConstants->GetThemeStyle();
if (!themeStyle) {
return;
}
@ -101,7 +104,10 @@ public:
theme->backgroundUnfocusColor_ = pattern->GetAttr<Color>("container_modal_unfocus_background", Color());
theme->titleTextColor_ = pattern->GetAttr<Color>("ohos_id_color_primary", Color());
auto isLightMode = SystemProperties::GetColorMode() == ColorMode::LIGHT;
auto resAdapter = themeConstants->GetResourceAdapter();
CHECK_NULL_VOID(resAdapter);
auto isLightMode = resAdapter->GetResourceColorMode() == ColorMode::LIGHT;
theme->iconPrimaryColor_ = pattern->GetAttr<Color>(
"icon_primary",
isLightMode ? Color(ICON_PRIMARY_LIGHT) : Color(ICON_PRIMARY_DARK)
@ -135,7 +141,7 @@ public:
Color GetControlBtnColor(bool isCloseBtn, ControlBtnColorType type)
{
auto isLightMode = SystemProperties::GetColorMode() == ColorMode::LIGHT;
auto isLightMode = IsLightMode();
auto normalBtnOpacity = isLightMode ? 0.1f : 0.2f;
auto normalBtnColor = iconPrimaryColor_;
auto closeBtnOpacity = isLightMode ? 0.1f : 0.3f;
@ -184,6 +190,13 @@ public:
return btnColor;
}
bool IsLightMode()
{
auto resAdapter = themeConstants_->GetResourceAdapter();
CHECK_NULL_RETURN(resAdapter, true);
return resAdapter->GetResourceColorMode() == ColorMode::LIGHT;
}
private:
Color backgroundColor_;
Color backgroundUnfocusColor_;
@ -194,6 +207,7 @@ private:
Color interactiveHoverColor_;
Color interactiveClickColor_;
Color warningColor_;
RefPtr<ThemeConstants> themeConstants_ = nullptr;
};
} // namespace OHOS::Ace