Commit 6b033466 authored by Ingomar Wesp's avatar Ingomar Wesp
Browse files

Backport to 4.6: Provide a proper minimumSize hint (preferredWidth for

horizontal form factors, preferredHeight for vertical ones).

CCBUG: 264606
CCBUG: 269419
parent b5458883
......@@ -242,6 +242,13 @@ QSizeF IconGridLayout::sizeHint(
switch(which) {
case Qt::PreferredSize: return m_preferredSizeHint;
case Qt::MinimumSize:
if (m_mode == PreferRows) {
return QSizeF(m_preferredSizeHint.width(), KIconLoader::SizeSmall);
}
else {
return QSizeF(KIconLoader::SizeSmall, m_preferredSizeHint.height());
}
default:
return QSizeF();
......@@ -409,6 +416,5 @@ void IconGridLayout::updateGridParameters()
m_preferredSizeHint = newPreferredSize;
updateGeometry();
}
}
}
......@@ -38,7 +38,6 @@ Name[kn]=ತಕ್ಷಣದ ಪ್ರಕ್ಷೇಪನೆ
Name[ko]=빠른 실행
Name[lt]=Greitas paleidimas
Name[lv]=Ātrā palaišana
Name[mai]=क्विक-लांच
Name[ml]=ക്വിക്ക്‌ലോഞ്ച്
Name[nb]=Hurtigstart
Name[nds]=Fixstart
......@@ -148,7 +147,7 @@ X-KDE-Library=plasma_applet_quicklaunch
X-KDE-PluginInfo-Author=Ingomar Wesp
X-KDE-PluginInfo-Email=ingomar@wesp.name
X-KDE-PluginInfo-Name=quicklaunch
X-KDE-PluginInfo-Version=0.3
X-KDE-PluginInfo-Version=0.3.1
X-KDE-PluginInfo-Website=http://plasma.kde.org/
X-KDE-PluginInfo-Category=Application Launchers
X-KDE-PluginInfo-Depends=
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment