diff --git a/src/declarativeimports/plasmaextracomponents/qml/Heading.qml b/src/declarativeimports/plasmaextracomponents/qml/Heading.qml index 317bbc74e..3056542c3 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/Heading.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/Heading.qml @@ -1,83 +1,83 @@ /* * Copyright 2012 by Sebastian Kügler * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details * * You should have received a copy of the GNU Library General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. */ import QtQuick 2.0 import org.kde.plasma.components 2.0 /** * A heading label used for subsections of texts. * * The characteristics of the text will be automatically set according to the * plasma theme. Use this components for section titles or headings in your UI, * for example page or section titles. * * Example usage: * * @code * import org.kde.plasma.extras 2.0 as PlasmaExtras * [...] * Column { * PlasmaExtras.Title { text: "Fruit sweetness on the rise" } * PlasmaExtras.Heading { text: "Apples in the sunlight"; level: 2 } * PlasmaExtras.Paragraph { text: "Long text about fruit and apples [...]" } * [...] * } * @endcode * * The most important property is "text", which applies to the text property of * Label. See PlasmaComponents Label and primitive QML Text element API for * additional properties, methods and signals. */ Label { id: heading /** * level: int * The level determines how big the section header is display, values * between 1 (big) and 5 (small) are accepted */ property int level: 1 /** * step: int * adjust the point size in between a level and another. */ property int step: 0 lineHeight: 1.2 font.pointSize: headerPointSize(level) wrapMode: Text.WordWrap function headerPointSize(l) { var n = theme.defaultFont.pointSize; var s; switch (l) { case 1: - return Math.round(n * 1.80) + step; + return Math.round(n * 1.50) + step; case 2: return Math.round(n * 1.30) + step; case 3: return Math.round(n * 1.20) + step; case 4: return Math.round(n * 1.10) + step; default: return n + step; } } } diff --git a/src/declarativeimports/plasmaextracomponents/qml/Title.qml b/src/declarativeimports/plasmaextracomponents/qml/Title.qml index 5c8a97ed8..1d4e830c2 100644 --- a/src/declarativeimports/plasmaextracomponents/qml/Title.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/Title.qml @@ -1,47 +1,48 @@ /* * Copyright 2012 by Sebastian Kügler * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Library General Public License for more details * * You should have received a copy of the GNU Library General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. */ import QtQuick 2.0 import org.kde.plasma.components 2.0 /** * This is a title label which uses the plasma theme. The characteristics of * the text will be automatically set according to the plasma theme. Use this * components for titles in your UI, for example page or section titles. * * Example usage: * @code * import org.kde.plasma.extras 2.0 as PlasmaExtras * [...] * Column { * PlasmaExtras.Title { text: "Fruit sweetness on the rise" } * PlasmaExtras.Heading { text: "Apples in the sunlight"; level: 2 } * PlasmaExtras.Paragraph { text: "Long text about fruit and apples [...]" } * [...] * } * @endcode * * See PlasmaComponents Label and primitive QML Text element API for additional * properties, methods and signals. * @deprecated use org.kde.Kirigami.Heading instead */ Label { id: root - font.pointSize: theme.defaultFont.pointSize*2 + // Match size of level 1 Heading + font.pointSize: Math.round(theme.defaultFont.pointSize * 1.50) }