diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp index f6f63a18b..0b79d8114 100644 --- a/frame/util/docksettings.cpp +++ b/frame/util/docksettings.cpp @@ -173,9 +173,9 @@ const QRect DockSettings::primaryRect() const return rect; } -const int DockSettings::dockMargin(const Position position) const +const int DockSettings::dockMargin() const { - if (position == Dock::Efficient) + if (m_displayMode == Dock::Efficient) return 0; return 10; @@ -201,7 +201,7 @@ const QRect DockSettings::windowRect(const Position position, const bool hide) c const QRect primaryRect = this->primaryRect(); const int offsetX = (primaryRect.width() - size.width()) / 2; const int offsetY = (primaryRect.height() - size.height()) / 2; - const int margin = this->dockMargin(position); + const int margin = this->dockMargin(); QPoint p(0, 0); switch (position) { case Top: diff --git a/frame/util/docksettings.h b/frame/util/docksettings.h index 9dd3c306e..fb7388f7c 100644 --- a/frame/util/docksettings.h +++ b/frame/util/docksettings.h @@ -78,7 +78,7 @@ public: inline const QSize windowSize() const { return m_mainWindowSize; } inline const quint8 Opacity() const { return m_opacity * 255; } inline const QSize fashionTraySize() const { return m_fashionTraySize; } - const int dockMargin(const Position position) const; + const int dockMargin() const; const QSize panelSize() const; const QRect windowRect(const Position position, const bool hide = false) const; @@ -130,6 +130,7 @@ private: int m_screenRawHeight; int m_screenRawWidth; double m_opacity; + int m_dockMargin; QSet m_forbidPositions; Position m_position; HideMode m_hideMode; diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp index 2fea9227b..56fb26585 100644 --- a/frame/window/mainwindow.cpp +++ b/frame/window/mainwindow.cpp @@ -615,7 +615,7 @@ void MainWindow::setStrutPartial() return; } - m_xcbMisc->set_strut_partial(winId(), orientation, strut + m_settings->dockMargin(m_settings->position()), strutStart, strutEnd); + m_xcbMisc->set_strut_partial(winId(), orientation, strut + m_settings->dockMargin(), strutStart, strutEnd); } void MainWindow::expand() @@ -730,7 +730,7 @@ void MainWindow::updatePanelVisible() break; QRectF r(pos(), size()); - const int margin = m_settings->dockMargin(m_settings->position()); + const int margin = m_settings->dockMargin(); switch (m_settings->position()) { case Dock::Top: r.setY(r.y() - margin);