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

set maximum size only when there is actually an hint

Browse Source
This commit is contained in:
Marco Martin 2014-03-06 15:26:05 +01:00
parent 3d5f105c80
commit ef1010f312
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/declarativeimports/core/dialog.cpp
View File

@ -734,9 +734,9 @@ void DialogProxy::updateMinimumHeight()
void DialogProxy::updateMaximumWidth() void DialogProxy::updateMaximumWidth()
{ {
if (m_mainItemLayout) { if (m_mainItemLayout) {
const int hint = m_mainItemLayout.data()->property("maximumWidth").toInt() + m_frameSvgItem->margins()->left() + m_frameSvgItem->margins()->right(); const int hint = m_mainItemLayout.data()->property("maximumWidth").toInt();
if (hint > 0) { if (hint > 0) {
setMaximumWidth(hint); setMaximumWidth(hint + m_frameSvgItem->margins()->left() + m_frameSvgItem->margins()->right());
} else { } else {
setMaximumWidth(DIALOGSIZE_MAX); setMaximumWidth(DIALOGSIZE_MAX);
} }
@ -748,9 +748,9 @@ void DialogProxy::updateMaximumWidth()
void DialogProxy::updateMaximumHeight() void DialogProxy::updateMaximumHeight()
{ {
if (m_mainItemLayout) { if (m_mainItemLayout) {
const int hint = m_mainItemLayout.data()->property("maximumHeight").toInt() + m_frameSvgItem->margins()->top() + m_frameSvgItem->margins()->bottom(); const int hint = m_mainItemLayout.data()->property("maximumHeight").toInt();
if (hint > 0) { if (hint > 0) {
setMaximumHeight(hint); setMaximumHeight(hint + m_frameSvgItem->margins()->top() + m_frameSvgItem->margins()->bottom());
} else { } else {
setMaximumHeight(DIALOGSIZE_MAX); setMaximumHeight(DIALOGSIZE_MAX);
} }