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

feat(dde-dock): save windowsize value

Browse Source
This commit is contained in:
wangxuwen 2019-11-15 14:18:05 +08:00
parent 71998ed9ac
commit bb45462b3c
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frame/util/docksettings.cpp
View File

@ -495,6 +495,7 @@ void DockSettings::calculateWindowConfig()
m_dockWindowSize = m_dockInter->windowSizeEfficient(); m_dockWindowSize = m_dockInter->windowSizeEfficient();
if (m_dockWindowSize > WINDOW_MAX_SIZE || m_dockWindowSize < WINDOW_MIN_SIZE) { if (m_dockWindowSize > WINDOW_MAX_SIZE || m_dockWindowSize < WINDOW_MIN_SIZE) {
m_dockWindowSize = EffICIENT_DEFAULT_HEIGHT; m_dockWindowSize = EffICIENT_DEFAULT_HEIGHT;
m_dockInter->setWindowSize(EffICIENT_DEFAULT_HEIGHT);
} }
switch (m_position) { switch (m_position) {
@ -517,6 +518,7 @@ void DockSettings::calculateWindowConfig()
m_dockWindowSize = m_dockInter->windowSizeFashion(); m_dockWindowSize = m_dockInter->windowSizeFashion();
if (m_dockWindowSize > WINDOW_MAX_SIZE || m_dockWindowSize < WINDOW_MIN_SIZE) { if (m_dockWindowSize > WINDOW_MAX_SIZE || m_dockWindowSize < WINDOW_MIN_SIZE) {
m_dockWindowSize = FASHION_DEFAULT_HEIGHT; m_dockWindowSize = FASHION_DEFAULT_HEIGHT;
m_dockInter->setWindowSize(FASHION_DEFAULT_HEIGHT);
} }
switch (m_position) { switch (m_position) {

4
frame/window/mainwindow.cpp
View File

@ -987,14 +987,18 @@ void MainWindow::onDragFinished()
if (m_settings->displayMode() == Fashion) { if (m_settings->displayMode() == Fashion) {
if (Dock::Top == m_curDockPos || Dock::Bottom == m_curDockPos) { if (Dock::Top == m_curDockPos || Dock::Bottom == m_curDockPos) {
m_settings->m_dockInter->setWindowSizeFashion(m_settings->m_mainWindowSize.height()); m_settings->m_dockInter->setWindowSizeFashion(m_settings->m_mainWindowSize.height());
m_settings->m_dockInter->setWindowSize(m_settings->m_mainWindowSize.height());
} else { } else {
m_settings->m_dockInter->setWindowSizeFashion(m_settings->m_mainWindowSize.width()); m_settings->m_dockInter->setWindowSizeFashion(m_settings->m_mainWindowSize.width());
m_settings->m_dockInter->setWindowSize(m_settings->m_mainWindowSize.width());
} }
} else { } else {
if (Dock::Top == m_curDockPos || Dock::Bottom == m_curDockPos) { if (Dock::Top == m_curDockPos || Dock::Bottom == m_curDockPos) {
m_settings->m_dockInter->setWindowSizeEfficient(m_settings->m_mainWindowSize.height()); m_settings->m_dockInter->setWindowSizeEfficient(m_settings->m_mainWindowSize.height());
m_settings->m_dockInter->setWindowSize(m_settings->m_mainWindowSize.height());
} else { } else {
m_settings->m_dockInter->setWindowSizeEfficient(m_settings->m_mainWindowSize.width()); m_settings->m_dockInter->setWindowSizeEfficient(m_settings->m_mainWindowSize.width());
m_settings->m_dockInter->setWindowSize(m_settings->m_mainWindowSize.width());
} }
} }