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

bugfix: plugin item's spacing incorrect after dock-mode changed

Browse Source 
Change-Id: I8e99475a719aade99d8b200e35a85917607d7992
This commit is contained in:
杨万青 2015-09-06 19:40:20 +08:00
parent cc23d29b57
commit 1f3b1794d3
Notes: Deepin Code Review 2016-06-14 07:19:47 +00:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: <mr.asianwang@gmail.com>
Submitted-by: <mr.asianwang@gmail.com>
Submitted-at: Sun, 06 Sep 2015 19:36:53 +0800
Reviewed-on: https://cr.deepin.io/6801
Project: dde/dde-dock
Branch: refs/heads/master
15 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dde-dock/dde-dock.pro
View File

@ -32,6 +32,9 @@ headers.path = /usr/include/dde-dock
INSTALLS += headers target
HEADERS += \
src/interfaces/dockconstants.h \
src/interfaces/dockplugininterface.h \
src/interfaces/dockpluginproxyinterface.h \
libs/xcb_misc.h \
src/controller/appmanager.h \
src/controller/dockmodedata.h \

2
dde-dock/src/controller/plugins/dockpluginmanager.cpp
View File

@ -161,7 +161,7 @@ void DockPluginManager::onPluginItemAdded(AbstractDockItem *item, QString uuid)
handleNormalPluginAdd(item, uuid);
}
void DockPluginManager::onPluginItemRemoved(AbstractDockItem *item, QString uuid)
void DockPluginManager::onPluginItemRemoved(AbstractDockItem *item, QString)
{
m_sysPlugins.remove(item);
m_normalPlugins.remove(item);

2
dde-dock/src/controller/plugins/dockpluginmanager.h
View File

@ -44,7 +44,7 @@ private:
void updatePluginPos(Dock::DockMode newMode, Dock::DockMode oldMode);
void refreshSettingWindow();
void onPluginItemAdded(AbstractDockItem *item, QString uuid);
void onPluginItemRemoved(AbstractDockItem *item, QString uuid);
void onPluginItemRemoved(AbstractDockItem *item, QString);
private:
PluginsSettingFrame *m_settingFrame = NULL;

6
dde-dock/src/main.cpp
View File

@ -8,10 +8,10 @@
// let startdde know that we've already started.
void RegisterDdeSession()
{
char *envName = "DDE_SESSION_PROCESS_COOKIE_ID";
QString envName("DDE_SESSION_PROCESS_COOKIE_ID");
QByteArray cookie = qgetenv(envName);
qunsetenv(envName);
QByteArray cookie = qgetenv(envName.toUtf8().data());
qunsetenv(envName.toUtf8().data());
if (!cookie.isEmpty()) {
QDBusInterface iface("com.deepin.SessionManager",

3
dde-dock/src/mainwidget.cpp
View File

@ -24,12 +24,13 @@ MainWidget::MainWidget(QWidget *parent)
changeDockMode(m_dmd->getDockMode(), m_dmd->getDockMode());
DockUIDbus *dockUIDbus = new DockUIDbus(this);
Q_UNUSED(dockUIDbus)
XcbMisc::instance()->set_window_type(winId(),
XcbMisc::Dock);
}
void MainWidget::changeDockMode(Dock::DockMode newMode, Dock::DockMode oldMode)
void MainWidget::changeDockMode(Dock::DockMode, Dock::DockMode)
{
if (hasHidden)
return;

2
dde-dock/src/mainwidget.h
View File

@ -33,7 +33,7 @@ protected:
private:
void showDock();
void hideDock();
void changeDockMode(Dock::DockMode newMode,Dock::DockMode oldMode);
void changeDockMode(Dock::DockMode, Dock::DockMode);
void updateXcbStructPartial();
void initHideStateManager();
void initDockSetting();

2
dde-dock/src/panel/panel.cpp
View File

@ -237,7 +237,9 @@ void Panel::onAppItemRemove(const QString &id)
void Panel::onDockModeChanged(Dock::DockMode newMode, Dock::DockMode)
{
m_appLayout->setSpacing(m_dockModeData->getAppItemSpacing());
m_appLayout->relayout();
m_pluginLayout->setSpacing(m_dockModeData->getAppletsItemSpacing());
m_pluginLayout->relayout();
reanchorsLayout(newMode);

2
dde-dock/src/panel/panel.h
View File

@ -81,9 +81,9 @@ private:
bool m_containMouse = false;
bool m_isFashionMode = false;
const int REFLECTION_HEIGHT = 15;
const int FASHION_PANEL_LPADDING = 21;
const int FASHION_PANEL_RPADDING = 21;
const int REFLECTION_HEIGHT = 15;
const int WIDTH_ANIMATION_DURATION = 200;
const int SHOW_HIDE_ANIMATION_DURATION = 200;
const QEasingCurve SHOW_HIDE_EASINGCURVE = QEasingCurve::InSine;

2
dde-dock/src/widgets/abstractdockitem.h
View File

@ -38,7 +38,7 @@ public:
virtual bool moveable();
virtual bool actived();
virtual void invokeMenuItem(QString menuItemId, bool checked);
virtual void moveWithAnimation(QPoint targetPos, int duration = 100){}
virtual void moveWithAnimation(QPoint targetPos, int duration = 100){Q_UNUSED(targetPos) Q_UNUSED(duration)}
void setNextPos(int x, int y);
void setNextPos(const QPoint &value);

4
dde-dock/src/widgets/appitem.cpp
View File

@ -151,13 +151,13 @@ void AppItem::dropEvent(QDropEvent *event)
qWarning() << "Item get drop:" << event->pos();
}
void AppItem::enterEvent(QEvent *event)
void AppItem::enterEvent(QEvent *)
{
if (m_dockModeData->getDockMode() != Dock::FashionMode)
onMouseEnter();
}
void AppItem::leaveEvent(QEvent *event)
void AppItem::leaveEvent(QEvent *)
{
if (m_dockModeData->getDockMode() != Dock::FashionMode)
onMouseLeave();

4
dde-dock/src/widgets/appitem.h
View File

@ -59,8 +59,8 @@ protected:
void mouseReleaseEvent(QMouseEvent *event);
void mouseMoveEvent(QMouseEvent *);
void dropEvent(QDropEvent * event);
void enterEvent(QEvent *event);
void leaveEvent(QEvent *event);
void enterEvent(QEvent *);
void leaveEvent(QEvent *);
private:
void initClientManager();

2
dde-dock/src/widgets/docklayout.cpp
View File

@ -376,7 +376,7 @@ void DockLayout::leftToRightMove(int hoverIndex)
void DockLayout::topToBottomMove(int hoverIndex)
{
Q_UNUSED(hoverIndex)
}
void DockLayout::addSpacingItem()

1
dde-dock/src/widgets/docklayout.h
View File

@ -19,7 +19,6 @@ class DockLayout : public QWidget
public:
enum Direction{
LeftToRight,
RightToLeft,
TopToBottom
};

2
dde-dock/src/widgets/screenmask.cpp
View File

@ -20,7 +20,7 @@ void ScreenMask::dragEnterEvent(QDragEnterEvent *event)
emit itemEntered();
}
void ScreenMask::dragLeaveEvent(QDragLeaveEvent *event)
void ScreenMask::dragLeaveEvent(QDragLeaveEvent *)
{
emit itemExited();
}

2
dde-dock/src/widgets/screenmask.h
View File

@ -64,7 +64,7 @@ public:
protected:
void dragEnterEvent(QDragEnterEvent *event);
void dragLeaveEvent(QDragLeaveEvent *event);
void dragLeaveEvent(QDragLeaveEvent *);
void dropEvent(QDropEvent *event);
void enterEvent(QEvent *);