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

downgradle qt to 5.15.2

Browse Source
This commit is contained in:
王劲鹏
2021-04-26 21:21:59 +08:00
committed by osborn
parent f012d835dd
commit 0a7b66aeb3
11 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,14 +35,16 @@ void DoricModalPlugin::toast(QString jsValueString, QString callbackId) {
.at(0)
->childItems()
.at(0)
->childItems()
.at(0)
->setProperty("text", msg);
std::function setX = [window, parentWindow]() {
std::function<void()> setX = [window, parentWindow]() {
window->setProperty("x",
(parentWindow->width() - window->width()) / 2.f +
parentWindow->x());
};
std::function setY = [window, parentWindow, gravity]() {
std::function<void()> setY = [window, parentWindow, gravity]() {
if ((gravity & DoricGravity::DoricGravityBottom) ==
DoricGravity::DoricGravityBottom) {
window->setProperty("y", parentWindow->height() - window->height() -
@@ -101,12 +103,12 @@ void DoricModalPlugin::alert(QString jsValueString, QString callbackId) {
QQuickWindow *parentWindow =
getContext()->getRootNode()->getRootView()->window();
std::function setX = [window, parentWindow]() {
std::function<void()> setX = [window, parentWindow]() {
window->setProperty("x",
(parentWindow->width() - window->width()) / 2.f +
parentWindow->x());
};
std::function setY = [window, parentWindow]() {
std::function<void()> setY = [window, parentWindow]() {
window->setProperty("y",
(parentWindow->height() - window->height()) / 2 +
parentWindow->y());
@@ -156,12 +158,12 @@ void DoricModalPlugin::confirm(QString jsValueString, QString callbackId) {
QQuickWindow *parentWindow =
getContext()->getRootNode()->getRootView()->window();
std::function setX = [window, parentWindow]() {
std::function<void()> setX = [window, parentWindow]() {
window->setProperty("x",
(parentWindow->width() - window->width()) / 2.f +
parentWindow->x());
};
std::function setY = [window, parentWindow]() {
std::function<void()> setY = [window, parentWindow]() {
window->setProperty("y",
(parentWindow->height() - window->height()) / 2 +
parentWindow->y());
@@ -211,12 +213,12 @@ void DoricModalPlugin::prompt(QString jsValueString, QString callbackId) {
QQuickWindow *parentWindow =
getContext()->getRootNode()->getRootView()->window();
std::function setX = [window, parentWindow]() {
std::function<void()> setX = [window, parentWindow]() {
window->setProperty("x",
(parentWindow->width() - window->width()) / 2.f +
parentWindow->x());
};
std::function setY = [window, parentWindow]() {
std::function<void()> setY = [window, parentWindow]() {
window->setProperty("y",
(parentWindow->height() - window->height()) / 2 +
parentWindow->y());