Add QtQuick::Text::font.weight enum values
Followup to 517da68893be9e6d97c7993922c573de9560604d in qtbase: make all possible font weights available in QML. Task-number: QTBUG-38482 Change-Id: I4f821d2fadbcd42fbb237903be474d67a0a5a7c9 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
This commit is contained in:
parent
35bb082b25
commit
0f61aa5efe
|
@ -184,18 +184,30 @@ available when you import \c QtQuick.
|
|||
and 99 is extremely black. The following values are supported:
|
||||
|
||||
\table
|
||||
\row
|
||||
\li \c Font.Thin
|
||||
\li 0
|
||||
\row
|
||||
\li \c Font.ExtraLight
|
||||
\li 12
|
||||
\row
|
||||
\li \c Font.Light
|
||||
\li 25
|
||||
\row
|
||||
\li \c Font.Normal
|
||||
\li 50
|
||||
\row
|
||||
\li \c Font.Medium
|
||||
\li 57
|
||||
\row
|
||||
\li \c Font.DemiBold
|
||||
\li 63
|
||||
\row
|
||||
\li \c Font.Bold
|
||||
\li 75
|
||||
\row
|
||||
\li \c Font.ExtraBold
|
||||
\li 81
|
||||
\row
|
||||
\li \c Font.Black
|
||||
\li 87
|
||||
|
|
|
@ -1372,10 +1372,14 @@ QQuickText::~QQuickText()
|
|||
|
||||
The weight can be one of:
|
||||
\list
|
||||
\li Font.Thin
|
||||
\li Font.Light
|
||||
\li Font.ExtraLight
|
||||
\li Font.Normal - the default
|
||||
\li Font.Medium
|
||||
\li Font.DemiBold
|
||||
\li Font.Bold
|
||||
\li Font.ExtraBold
|
||||
\li Font.Black
|
||||
\endlist
|
||||
|
||||
|
|
|
@ -211,10 +211,14 @@ QString QQuickTextEdit::text() const
|
|||
|
||||
The weight can be one of:
|
||||
\list
|
||||
\li Font.Thin
|
||||
\li Font.Light
|
||||
\li Font.ExtraLight
|
||||
\li Font.Normal - the default
|
||||
\li Font.Medium
|
||||
\li Font.DemiBold
|
||||
\li Font.Bold
|
||||
\li Font.ExtraBold
|
||||
\li Font.Black
|
||||
\endlist
|
||||
|
||||
|
|
|
@ -234,10 +234,14 @@ QString QQuickTextInputPrivate::realText() const
|
|||
|
||||
The weight can be one of:
|
||||
\list
|
||||
\li Font.Thin
|
||||
\li Font.Light
|
||||
\li Font.ExtraLight
|
||||
\li Font.Normal - the default
|
||||
\li Font.Medium
|
||||
\li Font.DemiBold
|
||||
\li Font.Bold
|
||||
\li Font.ExtraBold
|
||||
\li Font.Black
|
||||
\endlist
|
||||
|
||||
|
|
|
@ -283,11 +283,15 @@ class QQuickFontValueType
|
|||
Q_PROPERTY(qreal wordSpacing READ wordSpacing WRITE setWordSpacing FINAL)
|
||||
|
||||
public:
|
||||
enum FontWeight { Light = QFont::Light,
|
||||
Normal = QFont::Normal,
|
||||
DemiBold = QFont::DemiBold,
|
||||
Bold = QFont::Bold,
|
||||
Black = QFont::Black };
|
||||
enum FontWeight { Thin = QFont::Thin,
|
||||
ExtraLight = QFont::ExtraLight,
|
||||
Light = QFont::Light,
|
||||
Normal = QFont::Normal,
|
||||
Medium = QFont::Medium,
|
||||
DemiBold = QFont::DemiBold,
|
||||
Bold = QFont::Bold,
|
||||
ExtraBold = QFont::ExtraBold,
|
||||
Black = QFont::Black };
|
||||
enum Capitalization { MixedCase = QFont::MixedCase,
|
||||
AllUppercase = QFont::AllUppercase,
|
||||
AllLowercase = QFont::AllLowercase,
|
||||
|
|
Loading…
Reference in New Issue