aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquicktextnode.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix positioning of images on new lines in Text elements.Andrew den Exter2012-01-031-1/+1
| | | | | | | | | If an image in a text node is at the start of a line include the relative position of the line when positioning it. Task-number: QTBUG-23410 Change-Id: Ic9927bf86386374a23acfc6b4478a26f86d43ec6 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix images not displaying on lines with no text.Andrew den Exter2011-12-071-0/+7
| | | | | | | | Update the current line when adding an image if it positioned at the start of the line. Change-Id: I7c29f8c3a8d8923030c473446bb6d03bfb524b49 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Prevent consecutive images from climbing up a text node.Andrew den Exter2011-12-071-2/+5
| | | | | | | | | | | Vertically position all nodes at the baseline minus their ascent. Previously the bounding rect of a glyph run was postioned on the base line and images at the baseline minus the ascent. This meant that calculated position of an image was correct if it followed text but if it followed another image it would be positioned above it. Change-Id: I03f5e0b48f132f010d16c49620fa9463873f9492 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Say hello to QtQuick moduleKent Hansen2011-12-021-0/+1344
This change moves the QtQuick 2 types and C++ API (including SceneGraph) to a new module (AKA library), QtQuick. 99% of this change is moving files from src/declarative to src/quick, and from tests/auto/declarative to tests/auto/qtquick2. The loading of QtQuick 2 ("import QtQuick 2.0") is now delegated to a plugin, src/imports/qtquick2, just like it's done for QtQuick 1. All tools, examples, and tests that use QtQuick C++ API have gotten "QT += quick" or "QT += quick-private" added to their .pro file. A few additional internal QtDeclarative classes had to be exported (via Q_DECLARATIVE_PRIVATE_EXPORT) since they're needed by the QtQuick 2 implementation. The old header locations (e.g. QtDeclarative/qquickitem.h) will still be supported for some time, but will produce compile-time warnings. (To avoid the QtQuick implementation using the compatibility headers (since QtDeclarative's includepath comes first), a few include statements were modified, e.g. from "#include <qsgnode.h>" to "#include <QtQuick/qsgnode.h>".) There's a change in qtbase that automatically adds QtQuick to the module list if QtDeclarative is used. Together with the compatibility headers, this should help reduce the migration pain for existing projects. In theory, simply getting an existing QtDeclarative-based project to compile and link shouldn't require any changes for now -- but porting to the new scheme is of course recommended, and will eventually become mandatory. Task-number: QTBUG-22889 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Change-Id: Ia52be9373172ba2f37e7623231ecb060316c96a7 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>