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

fixed(dock): fix bug 2697

Browse Source
This commit is contained in:
wangxuwen 2019-09-19 14:43:08 +08:00
parent 3cfbc502f0
commit 212103100b
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frame/util/docksettings.cpp
View File

@ -171,14 +171,6 @@ const QSize DockSettings::panelSize() const
const QRect DockSettings::windowRect(const Position position, const bool hide) const const QRect DockSettings::windowRect(const Position position, const bool hide) const
{ {
QSize size = m_mainWindowSize; QSize size = m_mainWindowSize;
if (hide) {
switch (position) {
case Top:
case Bottom: size.setHeight(2); break;
case Left:
case Right: size.setWidth(2); break;
}
}
const QRect primaryRect = this->primaryRect(); const QRect primaryRect = this->primaryRect();
const int offsetX = (primaryRect.width() - size.width()) / 2; const int offsetX = (primaryRect.width() - size.width()) / 2;

18
frame/window/mainwindow.cpp
View File

@ -501,25 +501,15 @@ void MainWindow::updateGeometry()
m_mainPanel->setPositonValue(position); m_mainPanel->setPositonValue(position);
resizeMainPanelWindow(); resizeMainPanelWindow();
bool animation = true; const QRect windowRect = m_settings->windowRect(position, true);
bool isHide = m_settings->hideState() == Hide && !testAttribute(Qt::WA_UnderMouse);
if (isHide) {
switch (position) {
case Top:
case Bottom: size.setHeight(2); break;
case Left:
case Right: size.setWidth(2); break;
}
animation = false;
QWidget::setFixedSize(size);
}
const QRect windowRect = m_settings->windowRect(position, isHide);
internalMove(windowRect.topLeft()); internalMove(windowRect.topLeft());
m_size = m_settings->m_mainWindowSize; m_size = m_settings->m_mainWindowSize;
QWidget::setFixedSize(size);
setStrutPartial();
m_mainPanel->update(); m_mainPanel->update();
} }