Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Graphic Ui
提交
7fe8711c
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,发现更多精彩内容 >>
未验证
提交
7fe8711c
编写于
3月 25, 2023
作者:
O
openharmony_ci
提交者:
Gitee
3月 25, 2023
浏览文件
操作
浏览文件
下载
差异文件
!920 修改graphic-ui的destroy错误拼写
Merge pull request !920 from guan0/master
上级
e75b1cc0
3a402b58
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
29 addition
and
29 deletion
+29
-29
frameworks/components/ui_dialog.cpp
frameworks/components/ui_dialog.cpp
+5
-5
frameworks/window/window.cpp
frameworks/window/window.cpp
+1
-1
interfaces/kits/components/root_view.h
interfaces/kits/components/root_view.h
+1
-1
interfaces/kits/components/ui_dialog.h
interfaces/kits/components/ui_dialog.h
+1
-1
interfaces/kits/window/window.h
interfaces/kits/window/window.h
+1
-1
test/unittest/common/hardware_acceleration_unit_test.cpp
test/unittest/common/hardware_acceleration_unit_test.cpp
+5
-5
test/unittest/dfx/event_injector_unit_test.cpp
test/unittest/dfx/event_injector_unit_test.cpp
+1
-1
test/unittest/dfx/view_bounds_unit_test.cpp
test/unittest/dfx/view_bounds_unit_test.cpp
+8
-8
test/unittest/render/render_uni_test.cpp
test/unittest/render/render_uni_test.cpp
+6
-6
未找到文件。
frameworks/components/ui_dialog.cpp
浏览文件 @
7fe8711c
...
...
@@ -37,7 +37,7 @@ public:
{
bool
ret
=
true
;
if
(
dialog_
!=
nullptr
)
{
dialog_
->
Dest
or
yWindow
();
dialog_
->
Dest
ro
yWindow
();
dialog_
->
isShowing_
=
false
;
}
if
(
onClickListener_
!=
nullptr
)
{
...
...
@@ -62,7 +62,7 @@ public:
if
((
dialog_
!=
nullptr
)
&&
(
dialog_
->
dialogLayer_
!=
nullptr
)
&&
!
dialog_
->
dialogLayer_
->
GetRect
().
IsContains
(
event
.
GetCurrentPos
()))
{
if
(
dialog_
->
enableAutoCancel_
)
{
dialog_
->
Dest
or
yWindow
();
dialog_
->
Dest
ro
yWindow
();
dialog_
->
isShowing_
=
false
;
}
if
(
dialog_
->
onCancelListener_
!=
nullptr
)
{
...
...
@@ -141,7 +141,7 @@ UIDialog::~UIDialog()
delete
line2_
;
line2_
=
nullptr
;
}
if
((
windowRootView_
!=
nullptr
)
&&
!
RootView
::
Dest
or
yWindowRootView
(
windowRootView_
))
{
if
((
windowRootView_
!=
nullptr
)
&&
!
RootView
::
Dest
ro
yWindowRootView
(
windowRootView_
))
{
windowRootView_
=
nullptr
;
}
if
(
dialogClickListener_
!=
nullptr
)
{
...
...
@@ -617,10 +617,10 @@ void UIDialog::EnableAutoCancel(bool enable)
enableAutoCancel_
=
enable
;
}
void
UIDialog
::
Dest
or
yWindow
()
void
UIDialog
::
Dest
ro
yWindow
()
{
if
(
window_
!=
nullptr
)
{
Window
::
Dest
or
yWindow
(
window_
);
Window
::
Dest
ro
yWindow
(
window_
);
window_
=
nullptr
;
}
}
...
...
frameworks/window/window.cpp
浏览文件 @
7fe8711c
...
...
@@ -31,7 +31,7 @@ Window* Window::CreateWindow(const WindowConfig& config)
return
window
;
}
void
Window
::
Dest
or
yWindow
(
Window
*
window
)
void
Window
::
Dest
ro
yWindow
(
Window
*
window
)
{
if
(
window
!=
nullptr
)
{
WindowImpl
*
windowImpl
=
reinterpret_cast
<
WindowImpl
*>
(
window
);
...
...
interfaces/kits/components/root_view.h
浏览文件 @
7fe8711c
...
...
@@ -97,7 +97,7 @@ public:
* @since 1.0
* @version 1.0
*/
static
bool
Dest
or
yWindowRootView
(
RootView
*
rootView
)
static
bool
Dest
ro
yWindowRootView
(
RootView
*
rootView
)
{
if
(
rootView
==
RootView
::
GetInstance
())
{
return
false
;
...
...
interfaces/kits/components/ui_dialog.h
浏览文件 @
7fe8711c
...
...
@@ -215,7 +215,7 @@ private:
void
Layout
();
void
LayoutButton
();
void
CreateDialogWindow
();
void
Dest
or
yWindow
();
void
Dest
ro
yWindow
();
bool
isShowing_
;
bool
enableAutoCancel_
;
...
...
interfaces/kits/window/window.h
浏览文件 @
7fe8711c
...
...
@@ -122,7 +122,7 @@ public:
* @since 1.0
* @version 1.0
*/
static
void
Dest
or
yWindow
(
Window
*
window
);
static
void
Dest
ro
yWindow
(
Window
*
window
);
/**
* @brief Binds the <b>RootView</b> to this window.
...
...
test/unittest/common/hardware_acceleration_unit_test.cpp
浏览文件 @
7fe8711c
...
...
@@ -142,7 +142,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareFill_001, TestSize.Level1)
TaskManager
::
GetInstance
()
->
TaskHandler
();
EXPECT_EQ
(
g_testDevice
->
fillIn_
,
true
);
Window
::
Dest
or
yWindow
(
rootView
->
GetBoundWindow
());
Window
::
Dest
ro
yWindow
(
rootView
->
GetBoundWindow
());
}
#endif
...
...
@@ -173,7 +173,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareBlend_001, TestSize.Level0)
TaskManager
::
GetInstance
()
->
TaskHandler
();
EXPECT_EQ
(
g_testDevice
->
blendIn_
,
true
);
Window
::
Dest
or
yWindow
(
rootView
->
GetBoundWindow
());
Window
::
Dest
ro
yWindow
(
rootView
->
GetBoundWindow
());
}
#endif
...
...
@@ -206,7 +206,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareBlend_002, TestSize.Level1)
TaskManager
::
GetInstance
()
->
TaskHandler
();
EXPECT_EQ
(
g_testDevice
->
blendIn_
,
true
);
Window
::
Dest
or
yWindow
(
rootView
->
GetBoundWindow
());
Window
::
Dest
ro
yWindow
(
rootView
->
GetBoundWindow
());
}
#endif
...
...
@@ -243,7 +243,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareTransform_001, TestSize.Level0)
TaskManager
::
GetInstance
()
->
TaskHandler
();
EXPECT_EQ
(
g_testDevice
->
transformIn_
,
true
);
Window
::
Dest
or
yWindow
(
rootView
->
GetBoundWindow
());
Window
::
Dest
ro
yWindow
(
rootView
->
GetBoundWindow
());
}
#endif
...
...
@@ -285,7 +285,7 @@ HWTEST_F(HardwareAccelerationTest, HardwareTransform_002, TestSize.Level1)
EXPECT_EQ
(
g_testDevice
->
fillIn_
,
false
);
EXPECT_EQ
(
g_testDevice
->
blendIn_
,
false
);
EXPECT_EQ
(
g_testDevice
->
transformIn_
,
false
);
Window
::
Dest
or
yWindow
(
rootView
->
GetBoundWindow
());
Window
::
Dest
ro
yWindow
(
rootView
->
GetBoundWindow
());
}
#endif
}
// namespace OHOS
test/unittest/dfx/event_injector_unit_test.cpp
浏览文件 @
7fe8711c
...
...
@@ -204,7 +204,7 @@ void EventInjectorTest::TearDownTestCase(void)
{
isRepeat_
=
false
;
pthread_join
(
mainTaskThread_
,
nullptr
);
Window
::
Dest
or
yWindow
(
window_
);
Window
::
Dest
ro
yWindow
(
window_
);
DeleteChildren
(
layout_
);
layout_
=
nullptr
;
...
...
test/unittest/dfx/view_bounds_unit_test.cpp
浏览文件 @
7fe8711c
...
...
@@ -55,9 +55,9 @@ public:
}
}
static
void
Dest
or
yWindow
(
RootView
*
rootView
)
static
void
Dest
ro
yWindow
(
RootView
*
rootView
)
{
Window
::
Dest
or
yWindow
(
rootView
->
GetBoundWindow
());
Window
::
Dest
ro
yWindow
(
rootView
->
GetBoundWindow
());
}
#endif // ENABLE_WINDOW
};
...
...
@@ -179,8 +179,8 @@ HWTEST_F(ViewBoundsTest, ViewBoundsOnPostDraw001, TestSize.Level0)
rootView
->
RemoveAll
();
delete
view1
;
delete
vg1
;
ViewBoundsTest
::
Dest
or
yWindow
(
rootView
);
RootView
::
Dest
or
yWindowRootView
(
rootView
);
ViewBoundsTest
::
Dest
ro
yWindow
(
rootView
);
RootView
::
Dest
ro
yWindowRootView
(
rootView
);
}
/**
...
...
@@ -230,13 +230,13 @@ HWTEST_F(ViewBoundsTest, ViewBoundsOnPostDraw002, TestSize.Level0)
rootView1
->
RemoveAll
();
delete
view1
;
delete
vg1
;
ViewBoundsTest
::
Dest
or
yWindow
(
rootView1
);
RootView
::
Dest
or
yWindowRootView
(
rootView1
);
ViewBoundsTest
::
Dest
ro
yWindow
(
rootView1
);
RootView
::
Dest
ro
yWindowRootView
(
rootView1
);
rootView2
->
RemoveAll
();
delete
view2
;
delete
vg2
;
ViewBoundsTest
::
Dest
or
yWindow
(
rootView2
);
RootView
::
Dest
or
yWindowRootView
(
rootView2
);
ViewBoundsTest
::
Dest
ro
yWindow
(
rootView2
);
RootView
::
Dest
ro
yWindowRootView
(
rootView2
);
}
#endif // ENABLE_WINDOW
}
// namespace OHOS
...
...
test/unittest/render/render_uni_test.cpp
浏览文件 @
7fe8711c
...
...
@@ -48,9 +48,9 @@ public:
}
}
static
void
Dest
or
yWindow
(
RootView
*
rootView
)
static
void
Dest
ro
yWindow
(
RootView
*
rootView
)
{
Window
::
Dest
or
yWindow
(
rootView
->
GetBoundWindow
());
Window
::
Dest
ro
yWindow
(
rootView
->
GetBoundWindow
());
}
};
...
...
@@ -103,8 +103,8 @@ HWTEST_F(RenderTest, Graphic_RenderTest_Test_Measuer_001, TestSize.Level0)
rootView
->
RemoveAll
();
delete
view1
;
delete
vg1
;
RenderTest
::
Dest
or
yWindow
(
rootView
);
RootView
::
Dest
or
yWindowRootView
(
rootView
);
RenderTest
::
Dest
ro
yWindow
(
rootView
);
RootView
::
Dest
ro
yWindowRootView
(
rootView
);
}
/**
...
...
@@ -136,7 +136,7 @@ HWTEST_F(RenderTest, Graphic_RenderTest_Test_Measuer_02, TestSize.Level0)
rootView
->
RemoveAll
();
delete
view1
;
delete
vg1
;
RenderTest
::
Dest
or
yWindow
(
rootView
);
RootView
::
Dest
or
yWindowRootView
(
rootView
);
RenderTest
::
Dest
ro
yWindow
(
rootView
);
RootView
::
Dest
ro
yWindowRootView
(
rootView
);
}
}
// namespace OHOS
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录