tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

remove 88 minus; set text order changed

Browse Source
This commit is contained in:
王劲鹏 2021-04-21 11:25:19 +08:00 committed by osborn
parent 398fef351c
commit c087f06647
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doric-Qt/doric/plugin/DoricModalPlugin.cpp
View File

@ -29,8 +29,6 @@ void DoricModalPlugin::toast(QString jsValueString, QString callbackId) {
QQuickItem *item = qobject_cast<QQuickItem *>(component.create());
item->setParentItem(rootObject);
item->childItems().at(0)->childItems().at(0)->setProperty("text", msg);
// init set y
if ((gravity & DoricGravity::DoricGravityBottom) ==
DoricGravity::DoricGravityBottom) {
@ -39,8 +37,7 @@ void DoricModalPlugin::toast(QString jsValueString, QString callbackId) {
DoricGravity::DoricGravityTop) {
item->setProperty("y", 20);
} else {
item->setProperty("y",
(rootObject->height() - item->height() - 88) / 2);
item->setProperty("y", (rootObject->height() - item->height()) / 2);
}
// update x
@ -49,21 +46,23 @@ void DoricModalPlugin::toast(QString jsValueString, QString callbackId) {
});
// update y
connect(item, &QQuickItem::heightChanged,
[rootObject, item, gravity]() {
connect(
item, &QQuickItem::heightChanged, [rootObject, item, gravity]() {
if ((gravity & DoricGravity::DoricGravityBottom) ==
DoricGravity::DoricGravityBottom) {
item->setProperty("y", rootObject->height() -
item->height() - 20);
item->setProperty("y",
rootObject->height() - item->height() - 20);
} else if ((gravity & DoricGravity::DoricGravityTop) ==
DoricGravity::DoricGravityTop) {
item->setProperty("y", 20);
} else {
item->setProperty(
"y", (rootObject->height() - item->height() - 88) / 2);
item->setProperty("y",
(rootObject->height() - item->height()) / 2);
}
});
item->childItems().at(0)->childItems().at(0)->setProperty("text", msg);
QTimer::singleShot(2000, qApp, [item]() {
item->setParent(nullptr);
item->setParentItem(nullptr);