diff --git a/org.kde.desktop/Control.qml b/org.kde.desktop/Control.qml --- a/org.kde.desktop/Control.qml +++ b/org.kde.desktop/Control.qml @@ -22,12 +22,22 @@ import QtQuick 2.6 import QtQuick.Templates @QQC2_VERSION@ as T +import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate T.Control { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, (contentItem ? contentItem.implicitWidth : 0) + leftPadding + rightPadding) implicitHeight: Math.max(background ? background.implicitHeight : 0, (contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding) + + leftPadding: styleItem.pixelMetric("layoutleftmargin") + topPadding: styleItem.pixelMetric("layouttopmargin") + rightPadding: styleItem.pixelMetric("layoutrightmargin") + bottomPadding: styleItem.pixelMetric("layoutbottommargin") + + StylePrivate.StyleItem { + id: styleItem + } } diff --git a/plugin/kquickstyleitem.cpp b/plugin/kquickstyleitem.cpp --- a/plugin/kquickstyleitem.cpp +++ b/plugin/kquickstyleitem.cpp @@ -1006,7 +1006,7 @@ int KQuickStyleItem::pixelMetric(const QString &metric) { - +qWarning()<<"GFHFDGDXGDG"<style()->pixelMetric(QStyle::PM_ScrollBarExtent, nullptr); else if (metric == QLatin1String("defaultframewidth")) @@ -1049,6 +1049,18 @@ return abs(qApp->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing, nullptr)); else if (metric == QLatin1String("treeviewindentation")) return qApp->style()->pixelMetric(QStyle::PM_TreeViewIndentation, nullptr); + else if (metric == QLatin1String("layouthorizontalspacing")) + return qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr); + else if (metric == QLatin1String("layoutverticalspacing")) + return qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing, nullptr); + else if (metric == QLatin1String("layoutleftmargin")) + return qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin, nullptr); + else if (metric == QLatin1String("layouttopmargin")) + return qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin, nullptr); + else if (metric == QLatin1String("layoutrightmargin")) + return qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin, nullptr); + else if (metric == QLatin1String("layoutbottommargin")) + return qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin, nullptr); return 0; }