Skip to content

Commit

Permalink
fix: dde-osd can't display bubble in treeland
Browse files Browse the repository at this point in the history 
  We only support external bubble in treeland.
  Using `DDE_CURRENT_COMPOSITER=TreeLand` to check whether is treeland.

Issue: linuxdeepin/developer-center#6095
  • Loading branch information
@18202781743
18202781743 committed Dec 26, 2023
1 parent 294f48d commit 939beb6
Showing 1 changed file with 65 additions and 39 deletions.
104 changes: 65 additions & 39 deletions dde-osd/src/notification/bubblemanager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,42 +42,52 @@ BubbleManager::BubbleManager(AbstractPersistence *persistence, AbstractNotifySet
, m_persistence(persistence)
, m_login1ManagerInterface(new Login1ManagerInterface(Login1DBusService, Login1DBusPath,
QDBusConnection::systemBus(), this))
, m_displayInter(new DisplayInter(DisplayDaemonDBusServie, DisplayDaemonDBusPath,
QDBusConnection::sessionBus(), this))
, m_dockDeamonInter(new DockInter(DockDaemonDBusServie, DockDaemonDBusPath,
QDBusConnection::sessionBus(), this))
, m_userInter(new UserInter(SessionDBusServie, SessionDaemonDBusPath,
QDBusConnection::sessionBus(), this))
, m_soundeffectInter(new SoundeffectInter(SoundEffectDaemonDBusServie, SoundEffectDaemonDBusPath,
QDBusConnection::sessionBus(), this))
QDBusConnection::sessionBus(), this))
, m_notifySettings(setting)
, m_notifyCenter(new NotifyCenterWidget(m_persistence))
, m_appearance(new Appearance("org.deepin.dde.Appearance1", "/org/deepin/dde/Appearance1", QDBusConnection::sessionBus(), this))
, m_gestureInter(new GestureInter("org.deepin.dde.Gesture1"
, "/org/deepin/dde/Gesture1"
, QDBusConnection::systemBus()
, this))
, m_dockInter(new DBusDockInterface(this))
, m_trickTimer(new QTimer(this))
{
if (!useBuiltinBubble()) {
qCDebug(notifiyBubbleLog) << "Default does not use built-in bubble.";
}

if (useBuiltinBubble()) {
m_displayInter = (new DisplayInter(DisplayDaemonDBusServie, DisplayDaemonDBusPath,
QDBusConnection::sessionBus(), this));
m_dockDeamonInter = (new DockInter(DockDaemonDBusServie, DockDaemonDBusPath,
QDBusConnection::sessionBus(), this));
m_soundeffectInter = (new SoundeffectInter(SoundEffectDaemonDBusServie, SoundEffectDaemonDBusPath,
QDBusConnection::sessionBus(), this));
m_appearance = (new Appearance("org.deepin.dde.Appearance1", "/org/deepin/dde/Appearance1", QDBusConnection::sessionBus(), this));
m_dockInter = (new DBusDockInterface(this));
m_gestureInter = (new GestureInter("org.deepin.dde.Gesture1"
, "/org/deepin/dde/Gesture1"
, QDBusConnection::systemBus()
, this));
}
m_trickTimer->setInterval(300);
m_trickTimer->setSingleShot(true);

initConnections();
geometryChanged();

m_notifyCenter->setMaskAlpha(static_cast<quint8>(m_appearance->opacity() * 255));
if (useBuiltinBubble()) {
m_notifyCenter->setMaskAlpha(static_cast<quint8>(m_appearance->opacity() * 255));
}
m_notifyCenter->hide();
registerAsService();

// 任务栏在左侧时，触屏划入距离需要超过100
m_slideWidth = (m_dockDeamonInter->position() == OSD::DockPosition::Right) ? 100 : 0;
m_dockInter->setSync(false);
if (useBuiltinBubble()) {
// 任务栏在左侧时，触屏划入距离需要超过100
m_slideWidth = (m_dockDeamonInter->position() == OSD::DockPosition::Right) ? 100 : 0;
m_dockInter->setSync(false);

connect(m_userInter, &__SessionManager1::LockedChanged, this, [ this ] {
// 当锁屏状态发生变化时立即隐藏所有通知并插入到通知中心（根据通知的实际情况决定），桌面和锁屏的通知不交叉显示
popAllBubblesImmediately();
});
connect(m_userInter, &__SessionManager1::LockedChanged, this, [ this ] {
// 当锁屏状态发生变化时立即隐藏所有通知并插入到通知中心（根据通知的实际情况决定），桌面和锁屏的通知不交叉显示
popAllBubblesImmediately();
});
}
}

BubbleManager::~BubbleManager()
Expand Down Expand Up @@ -162,10 +172,12 @@ uint BubbleManager::Notify(const QString &appName, uint replacesId,
}
#endif

// 如果display服务无效，无法获取显示器大小，不能正确计算显示位置，则不显示消息通知
if (!m_displayInter->isValid()) {
qWarning() << "The name org.deepin.dde.Display1 is invalid";
return 0;
if (useBuiltinBubble()) {
// 如果display服务无效，无法获取显示器大小，不能正确计算显示位置，则不显示消息通知
if (!m_displayInter->isValid()) {
qWarning() << "The name org.deepin.dde.Display1 is invalid";
return 0;
}
}

// 应用通知功能未开启不做处理
Expand Down Expand Up @@ -320,6 +332,11 @@ void BubbleManager::popAllBubblesImmediately()

bool BubbleManager::useBuiltinBubble() const
{
static bool isTreeLand = qEnvironmentVariable("DDE_CURRENT_COMPOSITER") == QString("TreeLand");
// treeland is not some dbus service.
if (isTreeLand)
return false;

return m_useBuiltinBubble;
}

Expand Down Expand Up @@ -607,6 +624,7 @@ void BubbleManager::Show()
}

m_trickTimer->start();

geometryChanged();

m_notifyCenter->onlyShowWidget();
Expand All @@ -619,6 +637,7 @@ void BubbleManager::Hide()
}

m_trickTimer->start();

geometryChanged();

m_notifyCenter->onlyHideWidget();
Expand Down Expand Up @@ -774,17 +793,19 @@ void BubbleManager::initConnections()
connect(m_login1ManagerInterface, SIGNAL(PrepareForSleep(bool)),
this, SLOT(onPrepareForSleep(bool)));

connect(m_displayInter, &DisplayInter::PrimaryRectChanged, this, &BubbleManager::geometryChanged, Qt::QueuedConnection);
connect(m_dockInter, &DBusDockInterface::geometryChanged, this, &BubbleManager::geometryChanged, Qt::UniqueConnection);
connect(m_dockDeamonInter, &DockInter::serviceValidChanged, this, &BubbleManager::geometryChanged, Qt::UniqueConnection);
if (useBuiltinBubble()) {
connect(m_displayInter, &DisplayInter::PrimaryRectChanged, this, &BubbleManager::geometryChanged, Qt::QueuedConnection);
connect(m_dockInter, &DBusDockInterface::geometryChanged, this, &BubbleManager::geometryChanged, Qt::UniqueConnection);
connect(m_dockDeamonInter, &DockInter::serviceValidChanged, this, &BubbleManager::geometryChanged, Qt::UniqueConnection);

connect(qApp, &QApplication::primaryScreenChanged, this, [ = ] {
updateGeometry();
});
connect(qApp, &QApplication::primaryScreenChanged, this, [ = ] {
updateGeometry();
});

connect(qApp->primaryScreen(), &QScreen::geometryChanged, this, [ = ] {
updateGeometry();
});
connect(qApp->primaryScreen(), &QScreen::geometryChanged, this, [ = ] {
updateGeometry();
});
}

connect(m_notifySettings, &NotifySettings::appSettingChanged, this, [ = ] (const QString &id, const uint &item, QVariant var) {
Q_EMIT AppInfoChanged(id, item, QDBusVariant(var));
Expand All @@ -801,12 +822,14 @@ void BubbleManager::initConnections()
Q_EMIT appRemoved(id);
});

// 响应任务栏方向改变信号，更新额外触屏划入距离
connect(m_dockDeamonInter, &DockInter::PositionChanged, this, [ this ] {
m_slideWidth = (m_dockDeamonInter->position() == OSD::DockPosition::Right) ? 100 : 0;
});
if (useBuiltinBubble()) {
// 响应任务栏方向改变信号，更新额外触屏划入距离
connect(m_dockDeamonInter, &DockInter::PositionChanged, this, [ this ] {
m_slideWidth = (m_dockDeamonInter->position() == OSD::DockPosition::Right) ? 100 : 0;
});

connect(m_appearance, &Appearance::OpacityChanged, this, &BubbleManager::onOpacityChanged);
connect(m_appearance, &Appearance::OpacityChanged, this, &BubbleManager::onOpacityChanged);
}

connect(&SignalBridge::ref(), &SignalBridge::actionInvoked, this, &BubbleManager::ActionInvoked);
}
Expand All @@ -823,6 +846,9 @@ void BubbleManager::onPrepareForSleep(bool sleep)

void BubbleManager::geometryChanged()
{
if (!useBuiltinBubble())
return;

m_currentDisplayRect = calcDisplayRect();
// dock未启动时，不要调用其接口，会导致系统刚启动是任务栏被提前启动（比窗管还早），造成显示异常，后续应该改成通知中心显示时才调用任务栏的接口，否则不应调用
if (m_dockInter->isValid()) {
Expand Down

0 comments on commit 939beb6

Please sign in to comment.