Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Graphic Ui
提交
61241554
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,发现更多精彩内容 >>
提交
61241554
编写于
7月 12, 2021
作者:
邓
邓志豪
提交者:
Gitee
7月 12, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
回退 'Pull Request !247 : 246 HILOG冲突问题'
上级
5022ffeb
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
46 addition
and
58 deletion
+46
-58
frameworks/animator/animator_manager.cpp
frameworks/animator/animator_manager.cpp
+0
-1
frameworks/components/ui_arc_label.cpp
frameworks/components/ui_arc_label.cpp
+0
-12
frameworks/components/ui_image_view.cpp
frameworks/components/ui_image_view.cpp
+0
-1
frameworks/components/ui_label_button.cpp
frameworks/components/ui_label_button.cpp
+0
-13
frameworks/components/ui_picker.cpp
frameworks/components/ui_picker.cpp
+0
-12
frameworks/components/ui_video.cpp
frameworks/components/ui_video.cpp
+0
-1
frameworks/components/ui_view.cpp
frameworks/components/ui_view.cpp
+0
-14
interfaces/kits/components/ui_arc_label.h
interfaces/kits/components/ui_arc_label.h
+10
-1
interfaces/kits/components/ui_label_button.h
interfaces/kits/components/ui_label_button.h
+12
-1
interfaces/kits/components/ui_picker.h
interfaces/kits/components/ui_picker.h
+10
-1
interfaces/kits/components/ui_view.h
interfaces/kits/components/ui_view.h
+14
-1
未找到文件。
frameworks/animator/animator_manager.cpp
浏览文件 @
61241554
...
...
@@ -16,7 +16,6 @@
#include "animator/animator_manager.h"
#include "common/task_manager.h"
#include "gfx_utils/graphic_log.h"
#include "hal_tick.h"
namespace
OHOS
{
...
...
frameworks/components/ui_arc_label.cpp
浏览文件 @
61241554
...
...
@@ -18,7 +18,6 @@
#include "draw/draw_label.h"
#include "engines/gfx/gfx_engine_manager.h"
#include "font/ui_font.h"
#include "gfx_utils/graphic_log.h"
#include "themes/theme_manager.h"
namespace
OHOS
{
...
...
@@ -210,15 +209,4 @@ void UIArcLabel::MeasureArcTextInfo()
arcTextInfo_
.
direct
,
orientation_
);
}
}
void
UIArcLabel
::
InitArcLabelText
()
{
if
(
arcLabelText_
==
nullptr
)
{
arcLabelText_
=
new
Text
();
if
(
arcLabelText_
==
nullptr
)
{
HILOG_ERROR
(
HILOG_MODULE_GRAPHIC
,
"new Text fail"
);
return
;
}
}
}
}
// namespace OHOS
\ No newline at end of file
frameworks/components/ui_image_view.cpp
浏览文件 @
61241554
...
...
@@ -20,7 +20,6 @@
#include "draw/draw_label.h"
#include "engines/gfx/gfx_engine_manager.h"
#include "gfx_utils/file.h"
#include "gfx_utils/graphic_log.h"
#include "gfx_utils/image_info.h"
#include "gfx_utils/mem_api.h"
#include "imgdecode/cache_manager.h"
...
...
frameworks/components/ui_label_button.cpp
浏览文件 @
61241554
...
...
@@ -17,7 +17,6 @@
#include "common/typed_text.h"
#include "draw/draw_label.h"
#include "font/ui_font.h"
#include "gfx_utils/graphic_log.h"
namespace
OHOS
{
UILabelButton
::
UILabelButton
()
:
labelButtonText_
(
nullptr
),
offset_
({
0
,
0
})
...
...
@@ -40,18 +39,6 @@ void UILabelButton::OnDraw(BufferInfo& gfxDstBuffer, const Rect& invalidatedArea
labelStyle_
,
ellipsisIndex
,
opa
);
}
void
UILabelButton
::
InitLabelButtonText
()
{
if
(
labelButtonText_
==
nullptr
)
{
labelButtonText_
=
new
Text
();
if
(
labelButtonText_
==
nullptr
)
{
HILOG_ERROR
(
HILOG_MODULE_GRAPHIC
,
"new Text fail"
);
return
;
}
labelButtonText_
->
SetAlign
(
TEXT_ALIGNMENT_CENTER
,
TEXT_ALIGNMENT_CENTER
);
}
}
UILabelButton
::~
UILabelButton
()
{
if
(
labelButtonText_
!=
nullptr
)
{
...
...
frameworks/components/ui_picker.cpp
浏览文件 @
61241554
...
...
@@ -17,7 +17,6 @@
#include "dock/vibrator_manager.h"
#include "draw/draw_line.h"
#include "draw/draw_rect.h"
#include "gfx_utils/graphic_log.h"
#include "themes/theme_manager.h"
namespace
{
...
...
@@ -246,17 +245,6 @@ void UIPicker::Refresh()
}
}
void
UIPicker
::
InitTextAdapter
()
{
if
(
textAdapter_
==
nullptr
)
{
textAdapter_
=
new
TextAdapter
();
if
(
textAdapter_
==
nullptr
)
{
HILOG_ERROR
(
HILOG_MODULE_GRAPHIC
,
"new TextAdapter fail"
);
return
;
}
}
}
bool
UIPicker
::
RefreshValues
(
int16_t
start
,
int16_t
end
)
{
if
(
!
isWidthSet_
||
!
isHeightSet_
||
!
itemsHeight_
||
((
start
==
0
)
&&
(
end
==
0
)))
{
...
...
frameworks/components/ui_video.cpp
浏览文件 @
61241554
...
...
@@ -14,7 +14,6 @@
*/
#include "components/ui_video.h"
#include "gfx_utils/graphic_log.h"
#include "securec.h"
#ifndef VERSION_LITE
...
...
frameworks/components/ui_view.cpp
浏览文件 @
61241554
...
...
@@ -548,20 +548,6 @@ Rect UIView::GetContentRect()
return
contentRect
;
}
void
UIView
::
ResizeVisibleArea
(
int16_t
x
,
int16_t
y
,
int16_t
width
,
int16_t
height
)
{
if
(
visibleRect_
==
nullptr
)
{
visibleRect_
=
new
Rect
();
if
(
visibleRect_
==
nullptr
)
{
HILOG_ERROR
(
HILOG_MODULE_GRAPHIC
,
"new Rect fail"
);
return
;
}
}
visibleRect_
->
SetWidth
(
width
);
visibleRect_
->
SetHeight
(
height
);
visibleRect_
->
SetPosition
(
x
,
y
);
}
Rect
UIView
::
GetOrigRect
()
const
{
int16_t
x
=
rect_
.
GetX
();
...
...
interfaces/kits/components/ui_arc_label.h
浏览文件 @
61241554
...
...
@@ -361,7 +361,16 @@ public:
protected:
Text
*
arcLabelText_
;
virtual
void
InitArcLabelText
();
virtual
void
InitArcLabelText
()
{
if
(
arcLabelText_
==
nullptr
)
{
arcLabelText_
=
new
Text
();
if
(
arcLabelText_
==
nullptr
)
{
HILOG_ERROR
(
HILOG_MODULE_GRAPHIC
,
"new Text fail"
);
return
;
}
}
}
void
RefreshArcLabel
();
private:
...
...
interfaces/kits/components/ui_label_button.h
浏览文件 @
61241554
...
...
@@ -37,6 +37,7 @@
#include "common/text.h"
#include "components/ui_button.h"
#include "gfx_utils/graphic_log.h"
namespace
OHOS
{
/**
...
...
@@ -289,7 +290,17 @@ public:
}
protected:
virtual
void
InitLabelButtonText
();
virtual
void
InitLabelButtonText
()
{
if
(
labelButtonText_
==
nullptr
)
{
labelButtonText_
=
new
Text
();
if
(
labelButtonText_
==
nullptr
)
{
HILOG_ERROR
(
HILOG_MODULE_GRAPHIC
,
"new Text fail"
);
return
;
}
labelButtonText_
->
SetAlign
(
TEXT_ALIGNMENT_CENTER
,
TEXT_ALIGNMENT_CENTER
);
}
}
Text
*
labelButtonText_
;
...
...
interfaces/kits/components/ui_picker.h
浏览文件 @
61241554
...
...
@@ -381,7 +381,16 @@ protected:
void
RefreshList
();
virtual
void
ClearList
();
virtual
void
Refresh
();
virtual
void
InitTextAdapter
();
virtual
void
InitTextAdapter
()
{
if
(
textAdapter_
==
nullptr
)
{
textAdapter_
=
new
TextAdapter
();
if
(
textAdapter_
==
nullptr
)
{
HILOG_ERROR
(
HILOG_MODULE_GRAPHIC
,
"new TextAdapter fail"
);
return
;
}
}
}
bool
isWidthSet_
:
1
;
bool
isHeightSet_
:
1
;
...
...
interfaces/kits/components/ui_view.h
浏览文件 @
61241554
...
...
@@ -49,6 +49,7 @@
#include "gfx_utils/color.h"
#include "gfx_utils/geometry2d.h"
#include "gfx_utils/graphic_buffer.h"
#include "gfx_utils/graphic_log.h"
#include "gfx_utils/heap_base.h"
#include "gfx_utils/image_info.h"
#include "gfx_utils/style.h"
...
...
@@ -891,7 +892,19 @@ public:
* @since 1.0
* @version 1.0
*/
void
ResizeVisibleArea
(
int16_t
x
,
int16_t
y
,
int16_t
width
,
int16_t
height
);
void
ResizeVisibleArea
(
int16_t
x
,
int16_t
y
,
int16_t
width
,
int16_t
height
)
{
if
(
visibleRect_
==
nullptr
)
{
visibleRect_
=
new
Rect
();
if
(
visibleRect_
==
nullptr
)
{
HILOG_ERROR
(
HILOG_MODULE_GRAPHIC
,
"new Rect fail"
);
return
;
}
}
visibleRect_
->
SetWidth
(
width
);
visibleRect_
->
SetHeight
(
height
);
visibleRect_
->
SetPosition
(
x
,
y
);
}
/**
* @brief Sets the width for the view.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录