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

fix: geometry error.

Browse Source 
Change-Id: I2ca89ec21e922298c203a8302044501ffc1ea311
This commit is contained in:
rekols 2018-05-15 20:02:37 +08:00
parent 31a29d95ca
commit 6725009933
Notes: gerrit 2018-05-16 09:51:53 +08:00 
Verified+1: Anonymous Coward #1000004
Code-Review+2: sbwtw <sbw@sbw.so>
Submitted-by: rekols <rekols@foxmail.com>
Submitted-at: Wed, 16 May 2018 09:51:53 +0800
Reviewed-on: https://cr.deepin.io/34754
Project: dde/dde-dock
Branch: refs/heads/master
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/dbus/dbusdockadaptors.cpp
View File

@ -42,6 +42,6 @@ MainWindow *DBusDockAdaptors::parent() const
QRect DBusDockAdaptors::geometry() const
{
return parent()->mainPanelGeometry();
return parent()->geometry();
}

7
frame/panel/mainpanel.cpp
View File

@ -173,8 +173,6 @@ void MainPanel::setEffectEnabled(const bool enabled)
void MainPanel::moveEvent(QMoveEvent* e)
{
DBlurEffectWidget::moveEvent(e);
emit geometryChanged();
}
void MainPanel::resizeEvent(QResizeEvent *e)
@ -183,8 +181,6 @@ void MainPanel::resizeEvent(QResizeEvent *e)
m_itemAdjustTimer->start();
// m_effectWidget->resize(e->size());
emit geometryChanged();
}
void MainPanel::dragEnterEvent(QDragEnterEvent *e)
@ -496,6 +492,9 @@ void MainPanel::adjustItemSize()
--extraDecrease;
}
// make it after the adjustment to send signals.
emit geometryChanged();
// ensure all extra space assigned
Q_ASSERT(extraDecrease == 0);
}

5
frame/window/mainwindow.cpp
View File

@ -117,11 +117,6 @@ MainWindow::~MainWindow()
delete m_xcbMisc;
}
QRect MainWindow::mainPanelGeometry() const
{
return m_mainPanel->geometry();
}
void MainWindow::launch()
{
m_updatePanelVisible = false;

2
frame/window/mainwindow.h
View File

@ -44,8 +44,6 @@ public:
explicit MainWindow(QWidget *parent = 0);
~MainWindow();
QRect mainPanelGeometry() const;
public slots:
void launch();