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

Update window icon geometry

Browse Source 
Change-Id: I28cd8e5db77acb7faf35109d6ef6af4050827a3e
This commit is contained in:
Hualet Wang 2016-07-22 14:59:43 +08:00
parent 2710ac5256
commit 4066feac30
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frame/item/appitem.cpp
View File

@ -2,6 +2,7 @@
#include "util/themeappicon.h"
#include "util/imagefactory.h"
#include "xcb/xcb_misc.h"
#include <QPainter>
#include <QDrag>
@ -20,7 +21,8 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent)
m_horizontalIndicator(QPixmap(":/indicator/resources/indicator.png")),
m_verticalIndicator(QPixmap(":/indicator/resources/indicator_ver.png")),
m_activeHorizontalIndicator(QPixmap(":/indicator/resources/indicator_active.png")),
m_activeVerticalIndicator(QPixmap(":/indicator/resources/indicator_active_ver.png"))
m_activeVerticalIndicator(QPixmap(":/indicator/resources/indicator_active_ver.png")),
m_updateIconGeometryTimer(new QTimer(this))
{
setAccessibleName(m_itemEntry->name());
setAcceptDrops(true);
@ -32,10 +34,15 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent)
m_appNameTips->setStyleSheet("color:white;"
"padding:5px 10px;");
m_updateIconGeometryTimer->setInterval(500);
m_updateIconGeometryTimer->setSingleShot(true);
connect(m_itemEntry, &DBusDockEntry::ActiveChanged, this, &AppItem::activeChanged);
connect(m_itemEntry, &DBusDockEntry::TitlesChanged, this, &AppItem::updateTitle);
connect(m_itemEntry, &DBusDockEntry::ActiveChanged, this, static_cast<void (AppItem::*)()>(&AppItem::update));
connect(m_updateIconGeometryTimer, &QTimer::timeout, this, &AppItem::updateWindowIconGeometries);
updateTitle();
updateIcon();
}
@ -45,6 +52,23 @@ const QString AppItem::appId() const
return m_id;
}
// Update _NET_WM_ICON_GEOMETRY property for windows that every item
// that manages, so that WM can do proper animations for specific
// window behaviors like minimization.
void AppItem::updateWindowIconGeometries()
{
QRect rect(mapToGlobal(QPoint(0, 0)),
mapToGlobal(QPoint(width(),height())));
if (rect != m_lastGlobalGeometry) {
QList<quint32> winIds = m_titles.keys();
for (quint32 winId : winIds) {
XcbMisc::instance()->set_window_icon_geometry(winId, rect);
}
m_lastGlobalGeometry = rect;
}
}
void AppItem::setIconBaseSize(const int size)
{
IconBaseSize = size;
@ -204,6 +228,12 @@ void AppItem::paintEvent(QPaintEvent *e)
// draw ligher
if (m_hover)
painter.drawPixmap(itemRect.center() - pixmap.rect().center(), ImageFactory::lighterEffect(pixmap));
// Update the window icon geometry when the icon is changed.
if (m_updateIconGeometryTimer->isActive()) {
m_updateIconGeometryTimer->stop();
}
m_updateIconGeometryTimer->start();
}
void AppItem::mouseReleaseEvent(QMouseEvent *e)

4
frame/item/appitem.h
View File

@ -13,6 +13,7 @@ public:
explicit AppItem(const QDBusObjectPath &entry, QWidget *parent = nullptr);
const QString appId() const;
void updateWindowIconGeometries();
static void setIconBaseSize(const int size);
static int iconBaseSize();
static int itemBaseHeight();
@ -54,6 +55,9 @@ private:
QPixmap m_activeHorizontalIndicator;
QPixmap m_activeVerticalIndicator;
QRect m_lastGlobalGeometry;
QTimer * m_updateIconGeometryTimer;
static int IconBaseSize;
static QPoint MousePressPos;
};