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

changed dbus interface

Browse Source 
Change-Id: Ic8a42e2574aaa766ffc5200e75a3a4ebc561d429
This commit is contained in:
石博文 2016-06-14 15:01:27 +08:00 committed by Hualet Wang
parent dc07ffba04
commit a5e99b83f8
5 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbus/dbusdockentry.h
View File

@ -88,9 +88,9 @@ public Q_SLOTS: // METHODS
} }
Q_SIGNALS: // SIGNALS Q_SIGNALS: // SIGNALS
void TitlesChanged(const quint32 xid, const QString &title);
// begin property changed signals // begin property changed signals
void ActiveChanged(); void ActiveChanged();
void TitlesChanged();
void DataChanged(); void DataChanged();
void IdChanged(); void IdChanged();
void TitleChanged(); void TitleChanged();

28
item/appitem.cpp
View File

@ -22,9 +22,8 @@ AppItem::AppItem(const QDBusObjectPath &entry, QWidget *parent)
m_titles = m_itemEntry->titles(); m_titles = m_itemEntry->titles();
m_id = m_itemEntry->id(); m_id = m_itemEntry->id();
qDebug() << m_titles;
connect(m_itemEntry,&DBusDockEntry::TitlesChanged, this, &AppItem::entryDataChanged); connect(m_itemEntry, &DBusDockEntry::TitlesChanged, this, &AppItem::titlesChanged);
connect(m_itemEntry, &DBusDockEntry::ActiveChanged, this, static_cast<void (AppItem::*)()>(&AppItem::update)); connect(m_itemEntry, &DBusDockEntry::ActiveChanged, this, static_cast<void (AppItem::*)()>(&AppItem::update));
} }
@ -51,24 +50,11 @@ void AppItem::paintEvent(QPaintEvent *e)
QPainter painter(this); QPainter painter(this);
if (m_itemEntry->active()) if (m_itemEntry->active())
{
painter.fillRect(rect(), Qt::blue); painter.fillRect(rect(), Qt::blue);
} else { else if (!m_titles.isEmpty())
painter.fillRect(rect(), Qt::cyan);
else
painter.fillRect(rect(), Qt::gray); painter.fillRect(rect(), Qt::gray);
}
// // draw current active background
// if (m_windows.contains(ActiveWindowId))
// {
// painter.fillRect(rect(), Qt::blue);
// } else if (m_data[APP_STATUS_KEY] == APP_ACTIVE_STATUS)
// {
// // draw active background
// painter.fillRect(rect(), Qt::cyan);
// } else {
// // draw normal background
// painter.fillRect(rect(), Qt::gray);
// }
// draw icon // draw icon
painter.fillRect(iconRect, Qt::yellow); painter.fillRect(iconRect, Qt::yellow);
@ -136,7 +122,9 @@ void AppItem::initClientManager()
// }); // });
} }
void AppItem::entryDataChanged(const quint32 xid, const QString &title) void AppItem::titlesChanged()
{ {
qDebug() << "title changed: " << xid << title; m_titles = m_itemEntry->titles();
update();
} }

2
item/appitem.h
View File

@ -22,7 +22,7 @@ private:
void startDrag(); void startDrag();
void initClientManager(); void initClientManager();
void entryDataChanged(const quint32 xid, const QString &title); void titlesChanged();
private: private:
DBusDockEntry *m_itemEntry; DBusDockEntry *m_itemEntry;

3
panel/mainpanel.cpp
View File

@ -9,6 +9,9 @@ MainPanel::MainPanel(QWidget *parent)
m_itemController(DockItemController::instance(this)) m_itemController(DockItemController::instance(this))
{ {
m_itemLayout->setSpacing(0);
m_itemLayout->setContentsMargins(5, 5, 5, 5);
setAcceptDrops(true); setAcceptDrops(true);
setObjectName("MainPanel"); setObjectName("MainPanel");
setStyleSheet("QWidget #MainPanel {" setStyleSheet("QWidget #MainPanel {"

2
window/mainwindow.cpp
View File

@ -13,7 +13,7 @@ MainWindow::MainWindow(QWidget *parent)
m_positionUpdateTimer(new QTimer(this)) m_positionUpdateTimer(new QTimer(this))
{ {
setWindowFlags(Qt::X11BypassWindowManagerHint); setWindowFlags(Qt::X11BypassWindowManagerHint | Qt::WindowDoesNotAcceptFocus);
setAttribute(Qt::WA_TranslucentBackground); setAttribute(Qt::WA_TranslucentBackground);
initComponents(); initComponents();