From ad01eee5b188a6d0b59334e577acae1c38819b41 Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Wed, 6 Mar 2024 02:44:45 +0000 Subject: [PATCH] sync: from linuxdeepin/dtkwidget Synchronize source files from linuxdeepin/dtkwidget. Source-pull-request: https://github.com/linuxdeepin/dtkwidget/pull/555 --- src/widgets/daboutdialog.cpp | 1 - src/widgets/dmainwindow.cpp | 2 +- src/widgets/dtitlebar.cpp | 2 +- tests/testcases/widgets/ut_dimageviewer.cpp | 20 +++++++++++--------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/widgets/daboutdialog.cpp b/src/widgets/daboutdialog.cpp index e593cd23d..3ee17afa8 100644 --- a/src/widgets/daboutdialog.cpp +++ b/src/widgets/daboutdialog.cpp @@ -210,7 +210,6 @@ void DAboutDialogPrivate::init() QHBoxLayout *mainLayout = new QHBoxLayout; mainLayout->setContentsMargins(0, 0, 0, 0); mainLayout->setSpacing(0); - mainLayout->setMargin(0); mainLayout->addLayout(leftVLayout, 2); mainLayout->addSpacing(20); mainLayout->addWidget(rightScrollArea, 3); diff --git a/src/widgets/dmainwindow.cpp b/src/widgets/dmainwindow.cpp index 1ea2bc8fb..d0232e6a9 100644 --- a/src/widgets/dmainwindow.cpp +++ b/src/widgets/dmainwindow.cpp @@ -214,7 +214,7 @@ void DMainWindow::setSidebarWidget(QWidget *widget) d->sidebarSep->raise(); DAnchorsBase::setAnchor(d->sidebarSep, Qt::AnchorRight, tb, Qt::AnchorRight); - tb->layout()->setMargin(0); + tb->layout()->setContentsMargins(QMargins(0, 0, 0, 0)); tb->setMovable(false); auto *contentAction = tb->toggleViewAction(); contentAction->setVisible(false); diff --git a/src/widgets/dtitlebar.cpp b/src/widgets/dtitlebar.cpp index 29f529f9f..9dc46e5b7 100644 --- a/src/widgets/dtitlebar.cpp +++ b/src/widgets/dtitlebar.cpp @@ -1276,7 +1276,7 @@ void DTitlebar::setSidebarHelper(DSidebarHelper *helper) d->sidebarBackgroundWidget = new QWidget(this); QHBoxLayout *hlay = new QHBoxLayout(d->sidebarBackgroundWidget); - hlay->setMargin(0); + hlay->setContentsMargins(QMargins(0, 0, 0, 0)); auto bgBlurWidget = new DBlurEffectWidget(d->sidebarBackgroundWidget); bgBlurWidget->setObjectName("titlebarBlurWidget"); bgBlurWidget->setBlendMode(DBlurEffectWidget::BehindWindowBlend); diff --git a/tests/testcases/widgets/ut_dimageviewer.cpp b/tests/testcases/widgets/ut_dimageviewer.cpp index dfaca0c3b..abe8f4058 100644 --- a/tests/testcases/widgets/ut_dimageviewer.cpp +++ b/tests/testcases/widgets/ut_dimageviewer.cpp @@ -441,15 +441,16 @@ TEST_F(ut_DImageViewer, testRequestPreviousImage) ASSERT_EQ(changeSignal.count(), 1); #else QMutableEventPoint point; - point.setGlobalPosition({0,0}); - point.setGlobalLastPosition({300,0}); - QTouchEvent touchEvent{QEvent::TouchEnd,nullptr,Qt::NoModifier,{point}}; + QEventPoint ep; + point.setGlobalPosition(ep, {0, 0}); + point.setGlobalLastPosition(ep, {300, 0}); + QTouchEvent touchEvent(QEvent::TouchEnd, nullptr, Qt::NoModifier, {ep}); viewer->event(&touchEvent); ASSERT_EQ(changeSignal.count(), 1); - point.setGlobalLastPosition({100,0}); - QTouchEvent touchEvent2{QEvent::TouchEnd, nullptr, Qt::NoModifier, {point}}; + point.setGlobalLastPosition(ep, {100, 0}); + QTouchEvent touchEvent2(QEvent::TouchEnd, nullptr, Qt::NoModifier, {ep}); viewer->event(&touchEvent2); ASSERT_EQ(changeSignal.count(), 1); #endif @@ -476,15 +477,16 @@ TEST_F(ut_DImageViewer, testRequestNextImage) ASSERT_EQ(changeSignal.count(), 1); #else QMutableEventPoint point; - point.setGlobalPosition({0,0}); - point.setGlobalLastPosition({-300, 0}); - QTouchEvent touchEvent(QEvent::TouchEnd, nullptr, Qt::NoModifier,{point}); + QEventPoint ep; + point.setGlobalPosition(ep, {0, 0}); + point.setGlobalLastPosition(ep, {-300, 0}); + QTouchEvent touchEvent(QEvent::TouchEnd, nullptr, Qt::NoModifier, {ep}); viewer->event(&touchEvent); ASSERT_EQ(changeSignal.count(), 1); // Test multi point touch. - QTouchEvent touchEvent2(QEvent::TouchEnd, nullptr, Qt::NoModifier, {point, point}); + QTouchEvent touchEvent2(QEvent::TouchEnd, nullptr, Qt::NoModifier, {ep, ep}); viewer->event(&touchEvent2); ASSERT_EQ(changeSignal.count(), 1); #endif