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

Merge "bugfix: can't launch launcher in win7 & xp mode"

Browse Source
This commit is contained in:
ding465398889 2015-08-31 09:45:52 +08:00 committed by Deepin Code Review
commit 586fefcb8f
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dde-dock/src/Widgets/launcheritem.cpp
View File

@ -2,8 +2,8 @@
LauncherItem::LauncherItem(QWidget *parent) : AbstractDockItem(parent)
{
resize(m_dmd->getNormalItemWidth(), m_dmd->getItemHeight());
connect(m_dmd, &DockModeData::dockModeChanged, this, &LauncherItem::changeDockMode);
resize(m_dockModeData->getNormalItemWidth(), m_dockModeData->getItemHeight());
connect(m_dockModeData, &DockModeData::dockModeChanged, this, &LauncherItem::changeDockMode);
m_appIcon = new AppIcon(this);
m_appIcon->resize(height(), height());
@ -30,11 +30,27 @@ void LauncherItem::leaveEvent(QEvent *)
hidePreview();
}
void LauncherItem::mousePressEvent(QMouseEvent *event)
{
if (m_dockModeData->getDockMode() != Dock::FashionMode)
slotMousePress(event);
else
AbstractDockItem::mousePressEvent(event);
}
void LauncherItem::mouseReleaseEvent(QMouseEvent *event)
{
if (m_dockModeData->getDockMode() != Dock::FashionMode)
slotMouseRelease(event);
else
AbstractDockItem::mouseReleaseEvent(event);
}
void LauncherItem::slotMousePress(QMouseEvent *event)
{
emit mousePress(event);
hidePreview();
hidePreview(0);
}
void LauncherItem::slotMouseRelease(QMouseEvent *event)
@ -46,20 +62,20 @@ void LauncherItem::slotMouseRelease(QMouseEvent *event)
void LauncherItem::changeDockMode(Dock::DockMode, Dock::DockMode)
{
resize(m_dmd->getNormalItemWidth(), m_dmd->getItemHeight());
resize(m_dockModeData->getNormalItemWidth(), m_dockModeData->getItemHeight());
updateIcon();
}
void LauncherItem::updateIcon()
{
m_appIcon->setIcon("deepin-launcher");
m_appIcon->resize(m_dmd->getAppIconSize(), m_dmd->getAppIconSize());
m_appIcon->resize(m_dockModeData->getAppIconSize(), m_dockModeData->getAppIconSize());
reanchorIcon();
}
void LauncherItem::reanchorIcon()
{
switch (m_dmd->getDockMode()) {
switch (m_dockModeData->getDockMode()) {
case Dock::FashionMode:
m_appIcon->move((width() - m_appIcon->width()) / 2, 0);
break;

4
dde-dock/src/Widgets/launcheritem.h
View File

@ -26,6 +26,8 @@ public:
protected:
void enterEvent(QEvent *);
void leaveEvent(QEvent *);
void mousePressEvent(QMouseEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
private slots:
void slotMousePress(QMouseEvent *event);
@ -37,7 +39,7 @@ private:
void reanchorIcon();
private:
DockModeData * m_dmd = DockModeData::instance();
DockModeData * m_dockModeData = DockModeData::instance();
AppIcon * m_appIcon = NULL;
QProcess * m_launcherProcess = NULL;
QString m_menuInterfacePath = "";