Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 清除dde-dock告警信息

Browse Source 
清除以下告警信息
[Warning] requestActivate() called for  QWidgetWindow(0xb87800, name="Dtk::Widget::DArrowRectangleClassWindow")  which has Qt::WindowDoesNotAcceptFocus set.
[Warning] Connecting to deprecated signal QDBusConnectionInterface::serviceOwnerChanged(QString,QString,QString)
[Warning] QLayout: Attempting to add QLayout "" to HoldContainer "", which already has a layout
[Warning] QObject::connect: invalid null paramete

Log: 通过优化使用，清除告警信息
Bug: https://pms.uniontech.com/zentao/bug-view-20977.html
This commit is contained in:
fengshaoxiong 2020-06-29 14:25:59 +08:00
parent 414a77abe9
commit b6a48e73c9
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/util/dockpopupwindow.cpp
View File

@ -46,7 +46,7 @@ DockPopupWindow::DockPopupWindow(QWidget *parent)
compositeChanged();
setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint | Qt::WindowDoesNotAcceptFocus);
setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint);
setAttribute(Qt::WA_InputMethodEnabled, false);
connect(m_acceptDelayTimer, &QTimer::timeout, this, &DockPopupWindow::accept);

3
frame/window/mainwindow.cpp
View File

@ -486,7 +486,8 @@ void MainWindow::initConnections()
connect(m_wmHelper, &DWindowManagerHelper::hasCompositeChanged, this, &MainWindow::compositeChanged, Qt::QueuedConnection);
connect(&m_platformWindowHandle, &DPlatformWindowHandle::frameMarginsChanged, m_shadowMaskOptimizeTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
connect(m_dbusDaemonInterface, &QDBusConnectionInterface::serviceOwnerChanged, this, &MainWindow::onDbusNameOwnerChanged);
if (m_dbusDaemonInterface && m_dbusDaemonInterface->isValid())
connect(m_dbusDaemonInterface, &QDBusConnectionInterface::serviceOwnerChanged, this, &MainWindow::onDbusNameOwnerChanged);
connect(DockItemManager::instance(), &DockItemManager::itemInserted, m_mainPanel, &MainPanelControl::insertItem, Qt::DirectConnection);
connect(DockItemManager::instance(), &DockItemManager::itemRemoved, m_mainPanel, &MainPanelControl::removeItem, Qt::DirectConnection);

4
plugins/tray/fashiontray/containers/holdcontainer.cpp
View File

@ -3,14 +3,14 @@
HoldContainer::HoldContainer(TrayPlugin *trayPlugin, QWidget *parent)
: AbstractContainer(trayPlugin, parent)
, m_mainBoxLayout(new QBoxLayout(QBoxLayout::Direction::LeftToRight, this))
, m_mainBoxLayout(new QBoxLayout(QBoxLayout::Direction::LeftToRight))
{
m_mainBoxLayout->setMargin(0);
m_mainBoxLayout->setContentsMargins(0, 0, 0, 0);
m_mainBoxLayout->setSpacing(TraySpace);
QBoxLayout *preLayout = wrapperLayout();
QBoxLayout *newLayout = new QBoxLayout(QBoxLayout::Direction::LeftToRight, this);
QBoxLayout *newLayout = new QBoxLayout(QBoxLayout::Direction::LeftToRight);
for (int i = 0; i < preLayout->count(); ++i) {
newLayout->addItem(preLayout->takeAt(i));
}

2
plugins/tray/indicatortray.cpp
View File

@ -175,7 +175,7 @@ void IndicatorTrayPrivate::initDBus(const QString &indicatorName)
}
const QJsonObject action = config.value("action").toObject();
if (!action.isEmpty())
if (!action.isEmpty() && indicatorTrayWidget)
q->connect(indicatorTrayWidget, &IndicatorTrayWidget::clicked, q, [ = ](uint8_t button_index, int x, int y) {
std::thread t([=]() -> void {
auto triggerConfig = action.value("trigger").toObject();