kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-27 06:03:51 +03:00
Code Issues Projects Releases Wiki Activity

improve Primary Config view syncGeometry

Browse Source 
--fix also a crash when updateInlineProperties
was called
This commit is contained in:
Michail Vourlakos 2020-05-16 19:31:40 +03:00
parent 614bb7014f
commit 741eedfc3c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/view/settings/primaryconfigview.cpp
View File

@ -288,10 +288,6 @@ void PrimaryConfigView::syncGeometry()
}
const QSize size(rootObject()->width(), rootObject()->height());
setMaximumSize(size);
setMinimumSize(size);
resize(size);
const auto location = m_latteView->containment()->location();
const auto scrGeometry = m_latteView->screenGeometry();
const auto availGeometry = m_availableScreenGeometry;
@ -343,7 +339,13 @@ void PrimaryConfigView::syncGeometry()
updateEnabledBorders();
m_geometryWhenVisible = QRect(position.x(), position.y(), size.width(), size.height());
auto geometry = QRect(position.x(), position.y(), size.width(), size.height());
if (m_geometryWhenVisible == geometry) {
return;
}
m_geometryWhenVisible = geometry;
setPosition(position);
@ -351,7 +353,9 @@ void PrimaryConfigView::syncGeometry()
m_shellSurface->setPosition(position);
}
// updateShowInlineProperties();
setMaximumSize(size);
setMinimumSize(size);
resize(size);
emit m_latteView->configWindowGeometryChanged();
}
@ -583,7 +587,7 @@ void PrimaryConfigView::updateShowInlineProperties()
//! consider screen geometry for showing or not the secondary window
if (showSecWindow && !geometryWhenVisible().isNull()) {
if (m_secConfigView->geometryWhenVisible().intersects(geometryWhenVisible())) {
if (m_secConfigView && m_secConfigView->geometryWhenVisible().intersects(geometryWhenVisible())) {
showSecWindow = false;
} else if (advancedApprovedSecWindow) {
showSecWindow = true;