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): fixed bug 2187 for dock display error when change position

Browse Source
This commit is contained in:
wangxuwen 2019-09-10 11:14:36 +08:00
parent 21da49ff2e
commit 368201498a
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frame/panel/mainpanel.cpp
View File

@ -411,7 +411,7 @@ void MainPanel::adjustItemSize()
const auto &itemList = m_itemController->itemList(); const auto &itemList = m_itemController->itemList();
// FTray: FashionTray // FTray: FashionTray
const QSize &FSTrayTotalSize = DockSettings::Instance().fashionTraySize(); // the total size of FSTray // const QSize &FSTrayTotalSize = DockSettings::Instance().fashionTraySize(); // the total size of FSTray
TrayPluginItem *FSTrayItem = nullptr; // the FSTray item object TrayPluginItem *FSTrayItem = nullptr; // the FSTray item object
QSize FSTraySuggestIconSize = itemSize; // the suggested size of FStray icons QSize FSTraySuggestIconSize = itemSize; // the suggested size of FStray icons
@ -445,13 +445,13 @@ void MainPanel::adjustItemSize()
if (m_position == Dock::Top || m_position == Dock::Bottom) { if (m_position == Dock::Top || m_position == Dock::Bottom) {
// item->setFixedWidth(FSTrayTotalSize.width()); // item->setFixedWidth(FSTrayTotalSize.width());
// item->setFixedHeight(itemSize.height()); // item->setFixedHeight(itemSize.height());
totalWidth += FSTrayTotalSize.width(); //totalWidth += FSTrayTotalSize.width();
totalHeight += itemSize.height(); totalHeight += itemSize.height();
} else { } else {
// item->setFixedWidth(itemSize.width()); // item->setFixedWidth(itemSize.width());
// item->setFixedHeight(FSTrayTotalSize.height()); // item->setFixedHeight(FSTrayTotalSize.height());
totalWidth += itemSize.width(); totalWidth += itemSize.width();
totalHeight += FSTrayTotalSize.height(); // totalHeight += FSTrayTotalSize.height();
} }
} else { } else {
item->setFixedSize(itemSize); item->setFixedSize(itemSize);

12
frame/util/docksettings.cpp
View File

@ -44,7 +44,6 @@ DockSettings::DockSettings(QWidget *parent)
: QObject(parent) : QObject(parent)
, m_autoHide(true) , m_autoHide(true)
, m_opacity(0.4) , m_opacity(0.4)
, m_fashionTraySize(QSize(0, 0))
, m_fashionModeAct(tr("Fashion Mode"), this) , m_fashionModeAct(tr("Fashion Mode"), this)
, m_efficientModeAct(tr("Efficient Mode"), this) , m_efficientModeAct(tr("Efficient Mode"), this)
, m_topPosAct(tr("Top"), this) , m_topPosAct(tr("Top"), this)
@ -367,9 +366,6 @@ void DockSettings::hideStateChanged()
void DockSettings::dockItemCountChanged() void DockSettings::dockItemCountChanged()
{ {
if (m_displayMode == Dock::Efficient)
return;
emit windowGeometryChanged(); emit windowGeometryChanged();
} }
@ -479,14 +475,6 @@ void DockSettings::onOpacityChanged(const double value)
void DockSettings::onFashionTraySizeChanged(const QSize &traySize) void DockSettings::onFashionTraySizeChanged(const QSize &traySize)
{ {
if (m_displayMode == Dock::Efficient)
return;
if (m_fashionTraySize == traySize)
return;
m_fashionTraySize = traySize;
emit windowGeometryChanged(); emit windowGeometryChanged();
} }

2
frame/util/docksettings.h
View File

@ -76,7 +76,6 @@ public:
inline const QRect frontendWindowRect() const { return m_frontendRect; } inline const QRect frontendWindowRect() const { return m_frontendRect; }
inline const QSize windowSize() const { return m_mainWindowSize; } inline const QSize windowSize() const { return m_mainWindowSize; }
inline const quint8 Opacity() const { return m_opacity * 255; } inline const quint8 Opacity() const { return m_opacity * 255; }
inline const QSize fashionTraySize() const { return m_fashionTraySize; }
const int dockMargin() const; const int dockMargin() const;
const QSize panelSize() const; const QSize panelSize() const;
@ -137,7 +136,6 @@ private:
DisplayMode m_displayMode; DisplayMode m_displayMode;
QRect m_primaryRawRect; QRect m_primaryRawRect;
QRect m_frontendRect; QRect m_frontendRect;
QSize m_fashionTraySize;
WhiteMenu m_settingsMenu; WhiteMenu m_settingsMenu;
WhiteMenu *m_hideSubMenu; WhiteMenu *m_hideSubMenu;

2
frame/window/mainwindow.cpp
View File

@ -783,7 +783,7 @@ void MainWindow::resetPanelEnvironment(const bool visible, const bool resetPosit
} }
m_mainPanel->move(finishPos); m_mainPanel->move(finishPos);
// m_mainPanel->updateDockPosition(position); m_mainPanel->setPositonValue(position);
} }
void MainWindow::updatePanelVisible() void MainWindow::updatePanelVisible()