diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:41 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-09-02 10:27:41 +0200 |
commit | 72f320a266d7f6e8055fdb57d0996363fcbc027a (patch) | |
tree | aa4944c3d78267aa1d44b92605bbb0e475546d20 /src/quick | |
parent | a85ff0f11cce53244085cab8d947325099015725 (diff) | |
parent | e41b519cfa8c9932b88db35b2d72588a13f19e4d (diff) |
Merge dev into 5.10
Change-Id: I4376b711fbf02ea978f5d347d34a4a6a0c95dab2
Diffstat (limited to 'src/quick')
-rw-r--r-- | src/quick/doc/src/qmltypereference.qdoc | 1 | ||||
-rw-r--r-- | src/quick/handlers/qquicktaphandler.cpp | 2 | ||||
-rw-r--r-- | src/quick/handlers/qquicktaphandler_p.h | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 42 | ||||
-rw-r--r-- | src/quick/items/qquickitem_p.h | 1 | ||||
-rw-r--r-- | src/quick/items/qquickitemsmodule.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquicktext.cpp | 17 | ||||
-rw-r--r-- | src/quick/items/qquicktextedit.cpp | 17 | ||||
-rw-r--r-- | src/quick/items/qquicktextinput.cpp | 17 | ||||
-rw-r--r-- | src/quick/items/qquickwindow.cpp | 5 | ||||
-rw-r--r-- | src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp | 14 | ||||
-rw-r--r-- | src/quick/scenegraph/compressedtexture/qsgpkmhandler_p.h | 6 | ||||
-rw-r--r-- | src/quick/util/qquickglobal.cpp | 8 | ||||
-rw-r--r-- | src/quick/util/qquickpath.cpp | 3 | ||||
-rw-r--r-- | src/quick/util/qquickvaluetypes.cpp | 13 | ||||
-rw-r--r-- | src/quick/util/qquickvaluetypes_p.h | 4 |
16 files changed, 119 insertions, 35 deletions
diff --git a/src/quick/doc/src/qmltypereference.qdoc b/src/quick/doc/src/qmltypereference.qdoc index 7c7bdbc137..0c2e2bc73d 100644 --- a/src/quick/doc/src/qmltypereference.qdoc +++ b/src/quick/doc/src/qmltypereference.qdoc @@ -171,6 +171,7 @@ available when you import \c QtQuick. \li \l real \c font.letterSpacing \li \l real \c font.wordSpacing \li \l bool \c font.kerning + \li \l bool \c font.preferShaping \li \l enumeration \c font.hintingPreference \endlist diff --git a/src/quick/handlers/qquicktaphandler.cpp b/src/quick/handlers/qquicktaphandler.cpp index 04c69e9c06..8b6519b4ba 100644 --- a/src/quick/handlers/qquicktaphandler.cpp +++ b/src/quick/handlers/qquicktaphandler.cpp @@ -287,7 +287,7 @@ void QQuickTapHandler::setPressed(bool press, bool cancel, QQuickEventPoint *poi else m_tapCount = 1; qCDebug(lcTapHandler) << objectName() << "tapped" << m_tapCount << "times"; - emit tapped(point); + emit tapped(); emit tapCountChanged(); m_lastTapTimestamp = ts; m_lastTapPos = point->scenePos(); diff --git a/src/quick/handlers/qquicktaphandler_p.h b/src/quick/handlers/qquicktaphandler_p.h index 0e9a6f0411..433d2138ea 100644 --- a/src/quick/handlers/qquicktaphandler_p.h +++ b/src/quick/handlers/qquicktaphandler_p.h @@ -95,7 +95,7 @@ Q_SIGNALS: void timeHeldChanged(); void longPressThresholdChanged(); void gesturePolicyChanged(); - void tapped(QQuickEventPoint *point); + void tapped(); void longPressed(); protected: diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 3b30dfacb9..84e3265ee4 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -5029,22 +5029,31 @@ void QQuickItemPrivate::transformChanged() #endif } +bool QQuickItemPrivate::filterKeyEvent(QKeyEvent *e, bool post) +{ + if (!extra.isAllocated() || !extra->keyHandler) + return false; + + if (post) + e->accept(); + + if (e->type() == QEvent::KeyPress) + extra->keyHandler->keyPressed(e, post); + else + extra->keyHandler->keyReleased(e, post); + + return e->isAccepted(); +} + void QQuickItemPrivate::deliverKeyEvent(QKeyEvent *e) { Q_Q(QQuickItem); Q_ASSERT(e->isAccepted()); - if (extra.isAllocated() && extra->keyHandler) { - if (e->type() == QEvent::KeyPress) - extra->keyHandler->keyPressed(e, false); - else - extra->keyHandler->keyReleased(e, false); - - if (e->isAccepted()) - return; - else - e->accept(); - } + if (filterKeyEvent(e, false)) + return; + else + e->accept(); if (e->type() == QEvent::KeyPress) q->keyPressEvent(e); @@ -5054,16 +5063,7 @@ void QQuickItemPrivate::deliverKeyEvent(QKeyEvent *e) if (e->isAccepted()) return; - if (extra.isAllocated() && extra->keyHandler) { - e->accept(); - - if (e->type() == QEvent::KeyPress) - extra->keyHandler->keyPressed(e, true); - else - extra->keyHandler->keyReleased(e, true); - } - - if (e->isAccepted() || !q->window()) + if (filterKeyEvent(e, true) || !q->window()) return; //only care about KeyPress now diff --git a/src/quick/items/qquickitem_p.h b/src/quick/items/qquickitem_p.h index d1aaf6026b..446a7d0945 100644 --- a/src/quick/items/qquickitem_p.h +++ b/src/quick/items/qquickitem_p.h @@ -564,6 +564,7 @@ public: virtual void transformChanged(); void deliverKeyEvent(QKeyEvent *); + bool filterKeyEvent(QKeyEvent *, bool post); #if QT_CONFIG(im) void deliverInputMethodEvent(QInputMethodEvent *); #endif diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp index e6321e9365..1406e5b547 100644 --- a/src/quick/items/qquickitemsmodule.cpp +++ b/src/quick/items/qquickitemsmodule.cpp @@ -397,6 +397,8 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor) #endif qmlRegisterType<QQuickFlickable, 10>(uri, 2, 10, "Flickable"); + qmlRegisterType<QQuickTextEdit, 10>(uri, 2, 10, "TextEdit"); + qmlRegisterType<QQuickText, 10>(uri, 2, 10, "Text"); } static void initResources() diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp index 07cc1ff76e..5f58f0cdde 100644 --- a/src/quick/items/qquicktext.cpp +++ b/src/quick/items/qquicktext.cpp @@ -1515,6 +1515,23 @@ QQuickText::~QQuickText() Text { text: "OATS FLAVOUR WAY"; font.kerning: false } \endqml */ + +/*! + \qmlproperty bool QtQuick::Text::font.preferShaping + \since 5.10 + + Sometimes, a font will apply complex rules to a set of characters in order to + display them correctly. In some writing systems, such as Brahmic scripts, this is + required in order for the text to be legible, but in e.g. Latin script, it is merely + a cosmetic feature. Setting the \c preferShaping property to false will disable all + such features when they are not required, which will improve performance in most cases. + + The default value is true. + + \qml + Text { text: "Some text"; font.preferShaping: false } + \endqml +*/ QFont QQuickText::font() const { Q_D(const QQuickText); diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp index 6190448479..da11913bde 100644 --- a/src/quick/items/qquicktextedit.cpp +++ b/src/quick/items/qquicktextedit.cpp @@ -368,6 +368,23 @@ QString QQuickTextEdit::text() const */ /*! + \qmlproperty bool QtQuick::TextEdit::font.preferShaping + \since 5.10 + + Sometimes, a font will apply complex rules to a set of characters in order to + display them correctly. In some writing systems, such as Brahmic scripts, this is + required in order for the text to be legible, but in e.g. Latin script, it is merely + a cosmetic feature. Setting the \c preferShaping property to false will disable all + such features when they are not required, which will improve performance in most cases. + + The default value is true. + + \qml + TextEdit { text: "Some text"; font.preferShaping: false } + \endqml +*/ + +/*! \qmlproperty string QtQuick::TextEdit::text The text to display. If the text format is AutoText the text edit will diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp index d01d604171..d516b6f30c 100644 --- a/src/quick/items/qquicktextinput.cpp +++ b/src/quick/items/qquicktextinput.cpp @@ -392,6 +392,23 @@ QString QQuickTextInputPrivate::realText() const TextInput { text: "OATS FLAVOUR WAY"; font.kerning: false } \endqml */ + +/*! + \qmlproperty bool QtQuick::TextInput::font.preferShaping + \since 5.10 + + Sometimes, a font will apply complex rules to a set of characters in order to + display them correctly. In some writing systems, such as Brahmic scripts, this is + required in order for the text to be legible, but in e.g. Latin script, it is merely + a cosmetic feature. Setting the \c preferShaping property to false will disable all + such features when they are not required, which will improve performance in most cases. + + The default value is true. + + \qml + TextInput { text: "Some text"; font.preferShaping: false } + \endqml +*/ QFont QQuickTextInput::font() const { Q_D(const QQuickTextInput); diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp index cf64a94631..7073c711ee 100644 --- a/src/quick/items/qquickwindow.cpp +++ b/src/quick/items/qquickwindow.cpp @@ -1678,8 +1678,9 @@ void QQuickWindowPrivate::deliverMouseEvent(QQuickPointerMouseEvent *pointerEven // if the grabber is an Item: // if the update consists of changing button state, don't accept it unless // the button is one in which the grabber is interested - if (pointerEvent->button() != Qt::NoButton && grabber->acceptedMouseButtons() - && !(grabber->acceptedMouseButtons() & pointerEvent->button())) { + Qt::MouseButtons acceptedButtons = grabber->acceptedMouseButtons(); + if (pointerEvent->button() != Qt::NoButton && acceptedButtons + && !(acceptedButtons & pointerEvent->button())) { pointerEvent->setAccepted(false); return; } diff --git a/src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp b/src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp index 1b8882e9a5..bb8fce046d 100644 --- a/src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp +++ b/src/quick/scenegraph/compressedtexture/qsgpkmhandler.cpp @@ -75,35 +75,35 @@ static unsigned int typeMap[5] = { GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 }; -EtcTexture::EtcTexture() +QEtcTexture::QEtcTexture() : m_texture_id(0), m_uploaded(false) { initializeOpenGLFunctions(); } -EtcTexture::~EtcTexture() +QEtcTexture::~QEtcTexture() { if (m_texture_id) glDeleteTextures(1, &m_texture_id); } -int EtcTexture::textureId() const +int QEtcTexture::textureId() const { if (m_texture_id == 0) { - EtcTexture *texture = const_cast<EtcTexture*>(this); + QEtcTexture *texture = const_cast<QEtcTexture*>(this); texture->glGenTextures(1, &texture->m_texture_id); } return m_texture_id; } -bool EtcTexture::hasAlphaChannel() const +bool QEtcTexture::hasAlphaChannel() const { return m_type == GL_COMPRESSED_RGBA8_ETC2_EAC || m_type == GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2; } -void EtcTexture::bind() +void QEtcTexture::bind() { if (m_uploaded && m_texture_id) { glBindTexture(GL_TEXTURE_2D, m_texture_id); @@ -158,7 +158,7 @@ public: int textureByteCount() const { return m_data.size(); } QSGTexture *createTexture(QQuickWindow *) const { - EtcTexture *texture = new EtcTexture; + QEtcTexture *texture = new QEtcTexture; texture->m_data = m_data; texture->m_size = m_size; texture->m_paddedSize = m_paddedSize; diff --git a/src/quick/scenegraph/compressedtexture/qsgpkmhandler_p.h b/src/quick/scenegraph/compressedtexture/qsgpkmhandler_p.h index 77097cb80a..eb6b2e46c0 100644 --- a/src/quick/scenegraph/compressedtexture/qsgpkmhandler_p.h +++ b/src/quick/scenegraph/compressedtexture/qsgpkmhandler_p.h @@ -66,12 +66,12 @@ public: QQuickTextureFactory *read(QIODevice *device); }; -class EtcTexture : public QSGTexture, protected QOpenGLFunctions +class QEtcTexture : public QSGTexture, protected QOpenGLFunctions { Q_OBJECT public: - EtcTexture(); - ~EtcTexture(); + QEtcTexture(); + ~QEtcTexture(); void bind(); diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 6df23cdff5..14ead56740 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -303,6 +303,7 @@ public: QV4::ScopedValue vwspac(scope, obj->get((s = v4->newString(QStringLiteral("wordSpacing"))))); QV4::ScopedValue vhint(scope, obj->get((s = v4->newString(QStringLiteral("hintingPreference"))))); QV4::ScopedValue vkerning(scope, obj->get((s = v4->newString(QStringLiteral("kerning"))))); + QV4::ScopedValue vshaping(scope, obj->get((s = v4->newString(QStringLiteral("preferShaping"))))); // pull out the values, set ok to true if at least one valid field is given. if (vbold->isBoolean()) { @@ -361,6 +362,13 @@ public: retn.setKerning(vkerning->booleanValue()); if (ok) *ok = true; } + if (vshaping->isBoolean()) { + bool enable = vshaping->booleanValue(); + if (enable) + retn.setStyleStrategy(static_cast<QFont::StyleStrategy>(retn.styleStrategy() & ~QFont::PreferNoShaping)); + else + retn.setStyleStrategy(static_cast<QFont::StyleStrategy>(retn.styleStrategy() | QFont::PreferNoShaping)); + } return retn; } diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp index 15defdc01b..b19eec6fb3 100644 --- a/src/quick/util/qquickpath.cpp +++ b/src/quick/util/qquickpath.cpp @@ -146,6 +146,9 @@ QT_BEGIN_NAMESPACE \li No \endtable + \note Path is a non-visual type; it does not display anything on its own. + To draw a path, use \l Shape. + \sa PathView, Shape, PathAttribute, PathPercent, PathLine, PathMove, PathQuad, PathCubic, PathArc, PathCurve, PathSvg */ QQuickPath::QQuickPath(QObject *parent) diff --git a/src/quick/util/qquickvaluetypes.cpp b/src/quick/util/qquickvaluetypes.cpp index bc4a72b6ea..e4a03f3b52 100644 --- a/src/quick/util/qquickvaluetypes.cpp +++ b/src/quick/util/qquickvaluetypes.cpp @@ -767,6 +767,19 @@ void QQuickFontValueType::setKerning(bool b) v.setKerning(b); } +bool QQuickFontValueType::preferShaping() const +{ + return (v.styleStrategy() & QFont::PreferNoShaping) == 0; +} + +void QQuickFontValueType::setPreferShaping(bool enable) +{ + if (enable) + v.setStyleStrategy(static_cast<QFont::StyleStrategy>(v.styleStrategy() & ~QFont::PreferNoShaping)); + else + v.setStyleStrategy(static_cast<QFont::StyleStrategy>(v.styleStrategy() | QFont::PreferNoShaping)); +} + QT_END_NAMESPACE #include "moc_qquickvaluetypes_p.cpp" diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h index a3f35a84ec..5a9af970e8 100644 --- a/src/quick/util/qquickvaluetypes_p.h +++ b/src/quick/util/qquickvaluetypes_p.h @@ -324,6 +324,7 @@ class QQuickFontValueType Q_PROPERTY(qreal wordSpacing READ wordSpacing WRITE setWordSpacing FINAL) Q_PROPERTY(HintingPreference hintingPreference READ hintingPreference WRITE setHintingPreference FINAL) Q_PROPERTY(bool kerning READ kerning WRITE setKerning FINAL) + Q_PROPERTY(bool preferShaping READ preferShaping WRITE setPreferShaping FINAL) public: enum FontWeight { Thin = QFont::Thin, @@ -397,6 +398,9 @@ public: bool kerning() const; void setKerning(bool b); + + bool preferShaping() const; + void setPreferShaping(bool b); }; QT_END_NAMESPACE |