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

take into account margins when propagating size hints

Browse Source
This commit is contained in:
Marco Martin 2014-02-12 15:33:56 +01:00
parent 6a7ebaf293
commit 68552f81dd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -652,7 +652,7 @@ QScreen* DialogProxy::screenForItem(QQuickItem* item) const
void DialogProxy::updateMinimumWidth()
{
if (m_mainItemLayout) {
setMinimumWidth(m_mainItemLayout.data()->property("minimumWidth").toInt());
setMinimumWidth(m_mainItemLayout.data()->property("minimumWidth").toInt() + m_frameSvgItem->margins()->left() + m_frameSvgItem->margins()->right());
} else {
setMinimumWidth(-1);
}
@ -661,7 +661,7 @@ void DialogProxy::updateMinimumWidth()
void DialogProxy::updateMinimumHeight()
{
if (m_mainItemLayout) {
setMinimumHeight(m_mainItemLayout.data()->property("minimumHeight").toInt());
setMinimumHeight(m_mainItemLayout.data()->property("minimumHeight").toInt() + m_frameSvgItem->margins()->top() + m_frameSvgItem->margins()->bottom());
} else {
setMinimumHeight(-1);
}
@ -670,7 +670,7 @@ void DialogProxy::updateMinimumHeight()
void DialogProxy::updateMaximumWidth()
{
if (m_mainItemLayout) {
const int hint = m_mainItemLayout.data()->property("maximumWidth").toInt();
const int hint = m_mainItemLayout.data()->property("maximumWidth").toInt() + m_frameSvgItem->margins()->left() + m_frameSvgItem->margins()->right();
if (hint > 0) {
setMaximumWidth(hint);
} else {
@ -684,7 +684,7 @@ void DialogProxy::updateMaximumWidth()
void DialogProxy::updateMaximumHeight()
{
if (m_mainItemLayout) {
const int hint = m_mainItemLayout.data()->property("maximumHeight").toInt();
const int hint = m_mainItemLayout.data()->property("maximumHeight").toInt() + m_frameSvgItem->margins()->top() + m_frameSvgItem->margins()->bottom();
if (hint > 0) {
setMaximumWidth(hint);
} else {

2
src/shell/panelconfigview.cpp
View File

@ -107,7 +107,7 @@ void PanelConfigView::syncGeometry()
void PanelConfigView::focusOutEvent(QFocusEvent *ev)
{
Q_UNUSED(ev)
close();
//close();
}
#include "moc_panelconfigview.cpp"