Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Graphic Ui
提交
b61a5b91
G
Graphic Ui
项目概览
OpenHarmony
/
Graphic Ui
大约 1 年 前同步成功
通知
13
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Graphic Ui
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b61a5b91
编写于
2月 07, 2023
作者:
O
openharmony_ci
提交者:
Gitee
2月 07, 2023
浏览文件
操作
浏览文件
下载
差异文件
!873 ENABLE_SPANNALBE_STRING 拼写错误问题
Merge pull request !873 from Itachi/master
上级
213e01f4
764ed19e
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
7 addition
and
7 deletion
+7
-7
frameworks/font/ui_font_vector.cpp
frameworks/font/ui_font_vector.cpp
+7
-7
未找到文件。
frameworks/font/ui_font_vector.cpp
浏览文件 @
b61a5b91
...
@@ -644,7 +644,7 @@ int8_t UIFontVector::GetGlyphNode(uint32_t unicode, GlyphNode& glyphNode, uint16
...
@@ -644,7 +644,7 @@ int8_t UIFontVector::GetGlyphNode(uint32_t unicode, GlyphNode& glyphNode, uint16
return
RET_VALUE_OK
;
return
RET_VALUE_OK
;
}
}
#if defined(ENABLE_SPANNA
LBE_STRING) && ENABLE_SPANNALB
E_STRING
#if defined(ENABLE_SPANNA
BLE_STRING) && ENABLE_SPANNABL
E_STRING
uint8_t
*
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
,
glyphNode
.
textStyle
);
uint8_t
*
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
,
glyphNode
.
textStyle
);
#else
#else
uint8_t
*
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
);
uint8_t
*
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
);
...
@@ -682,7 +682,7 @@ int8_t UIFontVector::GetGlyphNode(uint32_t unicode, GlyphNode& glyphNode, uint16
...
@@ -682,7 +682,7 @@ int8_t UIFontVector::GetGlyphNode(uint32_t unicode, GlyphNode& glyphNode, uint16
uint8_t
*
UIFontVector
::
GetBitmap
(
uint32_t
unicode
,
GlyphNode
&
glyphNode
,
uint16_t
fontId
,
uint8_t
fontSize
)
uint8_t
*
UIFontVector
::
GetBitmap
(
uint32_t
unicode
,
GlyphNode
&
glyphNode
,
uint16_t
fontId
,
uint8_t
fontSize
)
{
{
uint16_t
fontKey
=
GetKey
(
fontId
,
fontSize
);
uint16_t
fontKey
=
GetKey
(
fontId
,
fontSize
);
#if ENABLE_SPANNA
LB
E_STRING
#if ENABLE_SPANNA
BL
E_STRING
uint8_t
*
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
,
glyphNode
.
textStyle
);
uint8_t
*
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
,
glyphNode
.
textStyle
);
#else
#else
uint8_t
*
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
);
uint8_t
*
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
);
...
@@ -713,7 +713,7 @@ uint8_t* UIFontVector::GetBitmap(uint32_t unicode, GlyphNode& glyphNode, uint16_
...
@@ -713,7 +713,7 @@ uint8_t* UIFontVector::GetBitmap(uint32_t unicode, GlyphNode& glyphNode, uint16_
return
nullptr
;
return
nullptr
;
}
}
#if defined(ENABLE_SPANNA
LBE_STRING) && ENABLE_SPANNALB
E_STRING
#if defined(ENABLE_SPANNA
BLE_STRING) && ENABLE_SPANNABL
E_STRING
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
,
glyphNode
.
textStyle
);
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
,
glyphNode
.
textStyle
);
#else
#else
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
);
bitmap
=
UIFontCacheManager
::
GetInstance
()
->
GetBitmap
(
fontKey
,
unicode
);
...
@@ -733,7 +733,7 @@ bool UIFontVector::IsEmojiFont(uint16_t fontId)
...
@@ -733,7 +733,7 @@ bool UIFontVector::IsEmojiFont(uint16_t fontId)
return
(
fontInfo_
[
fontId
].
fontWeight
>=
16
);
// 16: rgb color font
return
(
fontInfo_
[
fontId
].
fontWeight
>=
16
);
// 16: rgb color font
}
}
#if defined(ENABLE_SPANNA
LBE_STRING) && ENABLE_SPANNALB
E_STRING
#if defined(ENABLE_SPANNA
BLE_STRING) && ENABLE_SPANNABL
E_STRING
void
UIFontVector
::
SetItaly
(
FT_GlyphSlot
slot
)
void
UIFontVector
::
SetItaly
(
FT_GlyphSlot
slot
)
{
{
if
(
slot
->
format
!=
FT_GLYPH_FORMAT_OUTLINE
)
{
if
(
slot
->
format
!=
FT_GLYPH_FORMAT_OUTLINE
)
{
...
@@ -806,7 +806,7 @@ int8_t UIFontVector::LoadGlyphIntoFace(uint16_t& fontId, uint8_t fontSize, uint3
...
@@ -806,7 +806,7 @@ int8_t UIFontVector::LoadGlyphIntoFace(uint16_t& fontId, uint8_t fontSize, uint3
glyphNode
.
advance
=
static_cast
<
uint16_t
>
(
faceInfo
.
face
->
glyph
->
advance
.
x
/
FONT_PIXEL_IN_POINT
);
glyphNode
.
advance
=
static_cast
<
uint16_t
>
(
faceInfo
.
face
->
glyph
->
advance
.
x
/
FONT_PIXEL_IN_POINT
);
glyphNode
.
fontId
=
fontId
;
glyphNode
.
fontId
=
fontId
;
#if defined(ENABLE_SPANNA
LBE_STRING) && ENABLE_SPANNALB
E_STRING
#if defined(ENABLE_SPANNA
BLE_STRING) && ENABLE_SPANNABL
E_STRING
SetFace
(
faceInfo
,
unicode
,
glyphNode
.
textStyle
);
SetFace
(
faceInfo
,
unicode
,
glyphNode
.
textStyle
);
#else
#else
SetFace
(
faceInfo
,
unicode
);
SetFace
(
faceInfo
,
unicode
);
...
@@ -864,7 +864,7 @@ uint8_t UIFontVector::IsGlyphFont(uint32_t unicode)
...
@@ -864,7 +864,7 @@ uint8_t UIFontVector::IsGlyphFont(uint32_t unicode)
void
UIFontVector
::
SetFace
(
FaceInfo
&
faceInfo
,
uint32_t
unicode
)
void
UIFontVector
::
SetFace
(
FaceInfo
&
faceInfo
,
uint32_t
unicode
)
{
{
#if defined(ENABLE_SPANNA
LBE_STRING) && ENABLE_SPANNALB
E_STRING
#if defined(ENABLE_SPANNA
BLE_STRING) && ENABLE_SPANNABL
E_STRING
SetFace
(
faceInfo
,
unicode
,
TEXT_STYLE_NORMAL
);
SetFace
(
faceInfo
,
unicode
,
TEXT_STYLE_NORMAL
);
#else
#else
Metric
*
f
=
reinterpret_cast
<
Metric
*>
(
UIMalloc
(
sizeof
(
Metric
)));
Metric
*
f
=
reinterpret_cast
<
Metric
*>
(
UIMalloc
(
sizeof
(
Metric
)));
...
@@ -923,7 +923,7 @@ void UIFontVector::SetFace(FaceInfo& faceInfo, uint32_t unicode)
...
@@ -923,7 +923,7 @@ void UIFontVector::SetFace(FaceInfo& faceInfo, uint32_t unicode)
#endif
#endif
}
}
#if defined(ENABLE_SPANNA
LBE_STRING) && ENABLE_SPANNALB
E_STRING
#if defined(ENABLE_SPANNA
BLE_STRING) && ENABLE_SPANNABL
E_STRING
void
UIFontVector
::
SetFace
(
FaceInfo
&
faceInfo
,
uint32_t
unicode
,
TextStyle
textStyle
)
void
UIFontVector
::
SetFace
(
FaceInfo
&
faceInfo
,
uint32_t
unicode
,
TextStyle
textStyle
)
{
{
Metric
f
;
Metric
f
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录