diff --git a/frame/util/docksettings.cpp b/frame/util/docksettings.cpp index 196b76538..fb508b0d2 100644 --- a/frame/util/docksettings.cpp +++ b/frame/util/docksettings.cpp @@ -495,6 +495,7 @@ void DockSettings::calculateWindowConfig() m_dockWindowSize = m_dockInter->windowSizeEfficient(); if (m_dockWindowSize > WINDOW_MAX_SIZE || m_dockWindowSize < WINDOW_MIN_SIZE) { m_dockWindowSize = EffICIENT_DEFAULT_HEIGHT; + m_dockInter->setWindowSize(EffICIENT_DEFAULT_HEIGHT); } switch (m_position) { @@ -517,6 +518,7 @@ void DockSettings::calculateWindowConfig() m_dockWindowSize = m_dockInter->windowSizeFashion(); if (m_dockWindowSize > WINDOW_MAX_SIZE || m_dockWindowSize < WINDOW_MIN_SIZE) { m_dockWindowSize = FASHION_DEFAULT_HEIGHT; + m_dockInter->setWindowSize(FASHION_DEFAULT_HEIGHT); } switch (m_position) { diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp index 1f2331c96..d132d1d11 100755 --- a/frame/window/mainwindow.cpp +++ b/frame/window/mainwindow.cpp @@ -987,14 +987,18 @@ void MainWindow::onDragFinished() if (m_settings->displayMode() == Fashion) { if (Dock::Top == m_curDockPos || Dock::Bottom == m_curDockPos) { m_settings->m_dockInter->setWindowSizeFashion(m_settings->m_mainWindowSize.height()); + m_settings->m_dockInter->setWindowSize(m_settings->m_mainWindowSize.height()); } else { m_settings->m_dockInter->setWindowSizeFashion(m_settings->m_mainWindowSize.width()); + m_settings->m_dockInter->setWindowSize(m_settings->m_mainWindowSize.width()); } } else { if (Dock::Top == m_curDockPos || Dock::Bottom == m_curDockPos) { m_settings->m_dockInter->setWindowSizeEfficient(m_settings->m_mainWindowSize.height()); + m_settings->m_dockInter->setWindowSize(m_settings->m_mainWindowSize.height()); } else { m_settings->m_dockInter->setWindowSizeEfficient(m_settings->m_mainWindowSize.width()); + m_settings->m_dockInter->setWindowSize(m_settings->m_mainWindowSize.width()); } }