alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't try to infer sizes when the dialog is not visible

Browse Source 
It suggests weird sizes and often resizes dialogs into -1x-1 size.

Reviewed by David Edmundson and Vishesh Handa
This commit is contained in:
Aleix Pol 2015-03-12 18:00:54 +01:00
parent 79a30ab7a3
commit 644b93830a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/plasmaquick/dialog.cpp
View File

@ -551,6 +551,9 @@ void DialogPrivate::syncToMainItemSize()
if (!componentComplete || !q->isVisible()) { if (!componentComplete || !q->isVisible()) {
return; return;
} }
if (mainItem->width() <= 0 || mainItem->height() <= 0) {
qWarning() << "trying to show an empty dialog";
}
updateTheme(); updateTheme();
if (visualParent) { if (visualParent) {
@ -608,7 +611,7 @@ void DialogPrivate::slotWindowPositionChanged()
{ {
// Tooltips always have all the borders // Tooltips always have all the borders
// floating windows have all borders // floating windows have all borders
if ((q->flags() & Qt::ToolTip) || location == Plasma::Types::Floating) { if (!q->isVisible() || (q->flags() & Qt::ToolTip) || location == Plasma::Types::Floating) {
return; return;
} }
@ -944,7 +947,7 @@ void Dialog::resizeEvent(QResizeEvent* re)
QQuickWindow::resizeEvent(re); QQuickWindow::resizeEvent(re);
//A dialog can be resized even if no mainItem has ever been set //A dialog can be resized even if no mainItem has ever been set
if (!d->mainItem) { if (!isVisible() || !d->mainItem) {
return; return;
} }