summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Fix memory leak when detaching QTouchEventTouchPointPrivateBradley T. Hughes2009-06-151-0/+2
| | | | | When detaching, we need to deref the original data to prevent us from leaking it.
* Make QTouchEvent::TouchPoint scene coordinate functions return screen ↵Bradley T. Hughes2009-06-151-0/+5
| | | | | | coordinates for widgets Previously these returned empty/invalid values.
* use char[] instead of QBitArray to pass to ioctlBradley T. Hughes2009-06-151-7/+14
| | | | Using the QBitArray::data_ptr() directly didn't work, unfortunately
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouchBradley T. Hughes2009-06-152-7/+4
|\
| * All events should be filtered through the gesture manager.Denis Dzyubenko2009-06-151-5/+1
| |
| * Set the gesture manager state before sending an eventDenis Dzyubenko2009-06-151-2/+3
| |
* | EV_CNT and ABS_CNT aren't available everywhere, use *_MAX + 1 insteadBradley T. Hughes2009-06-151-2/+2
|/
* Merge of masterBradley T. Hughes2009-06-1552-989/+1759
|
* Add multitouch support for the RX-71 deviceBradley T. Hughes2009-06-153-0/+297
| | | | | We have to by-pass X11 mouse events when using this device since we are reading directly from the /dev/input/event* device files.
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-1281-821/+989
|\ | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * Painting artifacts in QGraphicsView.Bjørn Erik Nilsen2009-06-113-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem appears in the chip demo when clicking an item while scrolling the view using the mouse wheel. The problem was that we didn't translate the the item's old painted view rect. There was also a problem when enabling the DontAdjustForAntialiasing flag, causing an item to not redraw its edges. We have to adjust the rectangle by (-1, -1, 1, 1) since QRect() and QRectF() behaves differently. Auto-test (made by Andreas) included. Reviewed-by: Andreas
| * QGraphicsView: Replace update() with updateAll().Bjørn Erik Nilsen2009-06-112-22/+20
| | | | | | | | | | | | | | | | | | | | We have some nice cut-offs when there's a full update pending, but we don't know about it if we call update() directly on the viewport. Instead call QGraphicsViewPrivate::updateAll() which has the same effect, except that it also sets a flag telling us a full update is pending. Reviewed-by: Andreas
| * Fixed ToolBar layout so that when a toolbar is resized to its sizeHintThierry Bastian2009-06-111-3/+4
| | | | | | | | we get a "sticky" effect
| * small change in a string, using startsWithThierry Bastian2009-06-111-1/+1
| |
| * Removed qApp and replaced with QApplication:: for static member callsThierry Bastian2009-06-1147-180/+178
| |
| * refactor of private getters for the mode i item widget classesThierry Bastian2009-06-118-162/+158
| |
| * remove q->layout() and q->parentWidget() code where unnecessaryThierry Bastian2009-06-1113-83/+79
| |
| * Fixed clipping bugs due to not accounting for the redirection offset.Samuel Rødal2009-06-111-20/+9
| | | | | | | | | | | | | | | | Also, updateInvMatrix() can be greatly simplified as updateMatrix() is always called whenever anything related to the state matrix changes, so we can assume that it's up-to-date. Reviewed-by: bnilsen
| * doc: Fixed several qdoc warnings.Martin Smith2009-06-112-4/+7
| |
| * Makes the ODF writer use one text:tab tag for each tab, per ODF spec.Thomas Zander2009-06-111-28/+23
| | | | | | | | | | | | | | | | We used tab-ref to place multiple tabs compressed into one tag just like text:s does, but thats not what the spec says. We now don't sum up tabs anymore but just simply write out one "<text:tab/>" tag per tab. Task: 249110
| * doc: Fixed several qdoc warnings.Martin Smith2009-06-111-2/+2
| |
| * Make sure custom arrow images works if we only specify it.Olivier Goffart2009-06-111-4/+14
| | | | | | | | | | | | | | | | Include change for spinbox, combobox, and menu. Task-number: 255849 Tested-by: Pierre Reviewed-by: jbache
| * Clean up qwidget_p.h since the last changeOlivier Goffart2009-06-111-8/+6
| | | | | | | | | | Reviewed-by: bnilsen Reviewed-by: Denis
| * Invalid QPersistentIndexes after QStandardItem::takeRowOlivier Goffart2009-06-111-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need the parent of each potential QPersistentModelIndex in order to cleanup when removing the rows. They need not to change in order QSortFilterProxyModel maping to be still valid. takeRow must not change the internal data before calling beginRemoveRow. Same thing for takeColumn Task-number: 255652 Reviewed-by: Thierry Reviewed-by: Leo
| * Autotest compile.Olivier Goffart2009-06-111-1/+1
| | | | | | | | This one is for qstandarditemmodel autotest
| * add parent and id properties to QGraphicsObjectLars Knoll2009-06-112-3/+76
| | | | | | | | | | | | In addition added documentation for the other properties. Reviewed-by: Andreas
| * added properties for x,y and z. Removed the notify for the pos property,Lars Knoll2009-06-113-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | add auto tests for QGraphicsObject FX items are better off with property notifications on each component rather than on the position. Added some basic testing for QGraphicsObject and fixed the failures exposed. Reviewed-by: Andreas
| * Add some meat to QGraphicsObjectLars Knoll2009-06-114-107/+166
| | | | | | | | | | | | | | | | Added a toGraphicsObject() method to QGraphicsItem to allow upcasting. Expose some of QGraphicsItems setter/getter pairs as real properties in QGraphicsObject, including NOTIFY signals. Reviewed-by: Andreas
| * move some properties from QGraphicsWidget to QGraphicsObjectLars Knoll2009-06-112-4/+4
| | | | | | | | | | | | These are properties of QGraphicsItem. QGraphicsObject should expose these. Reviewed-by: Andreas
| * add a QGraphicsObject class and change QGraphicsWidget and QGraphicsTextItem ↵Lars Knoll2009-06-115-49/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to inherit from it This changes the inheritance hierarchy of QGraphicsWidget from multiply inheriting from QObject, QGraphicsItem and QGraphicsLayoutItem to inherit from QGraphicsObject and QGraphicsLayoutItem. QGraphicsObject then simply inherits from QObject and QGraphicsItem. This change is binary compatible as it will leave the vtable layout unchanged and as the parent class doesn't appear in the C++ name mangling on any of our platforms. It's also source compatible as it isn't noticable by existing code. The restriction we have on QGraphicsObject is that we can not add any new virtual methods to it, or add data members to the class. We can however implement a QGraphicsObjectprivate inheriting from QGraphicsItemPrivate if there is a need to add data members to the class. This change will allow us to now have one single base for all QGraphicsItems that inherit from QObject: QGraphicsTextItem, QGraphicsWidget and in the future QFxItem. Having that single base class will significantly simplify our work in the qml engine. Reviewed-by: Andreas
| * Partially revert "Add (back) properties to QGraphicsItem to change theBjørn Erik Nilsen2009-06-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | transformations component" This partially reverts commit 56f23d4c, which changed the logic in updateCachedClipPathFromSetPosHelper. We cannot compute the item's transform relative to the parent by using transformToParent() because the new position is not yet set on the item, that's why the new position is passed into the function. However, I'll look into how we can get rid of the entire function, but keep it as is for now. Reviewed-by: Olivier
| * Compile on the Mac.Bjørn Erik Nilsen2009-06-111-2/+2
| | | | | | | | Broke after this commit: 32f32ee3e752a6cc03505ddaa48d2849eaedc2a6
| * We don't have to combine the world matrix anymore.Bjørn Erik Nilsen2009-06-101-5/+3
| | | | | | | | | | | | See also: 32f32ee3e752a6cc03505ddaa48d2849eaedc2a6 Reviewed-by: Andreas
| * removed superflous indirection (ie. using q->..) instead of using theThierry Bastian2009-06-1013-138/+123
| | | | | | | | private class member.
* | make sure touch events are enabled on the view's viewport when items are ↵Bradley T. Hughes2009-06-111-0/+9
| | | | | | | | | | | | interested in touch events this is a continuation of 0218d8f8dc569db9a1290f595a814c3690c1b14b
* | enable touch events on all views if an item has touch enabledBradley T. Hughes2009-06-113-7/+26
| |
* | remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent)Bradley T. Hughes2009-06-1112-698/+309
| | | | | | | | | | | | | | | | | | the API for these 2 classes is identical, the implementation is almost identical, they share the same data structures, so bite the bullet and merge them. this means we go back to using screenPos() instead of globalPos() again
* | another API review round: change Q*TouchEvent size() functions to return ↵Bradley T. Hughes2009-06-116-36/+39
| | | | | | | | | | | | rects instead these are more useful, as already shown in the fingerpaint example
* | rename Qt::WA_AcceptedTouchBeginEvent to Qt::WA_WState_AcceptedTouchBeginEventBradley T. Hughes2009-06-111-3/+5
| | | | | | | | | | this is an internal widget state variable, so the name should reflect that (and we shouldn't include it in the docs either)
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-1022-1447/+1443
|\ \ | |/ | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene_p.h
| * Fixed memory leak in raster paint engine.Samuel Rødal2009-06-101-1/+3
| | | | | | | | | | | | | | Unlike the span array, the clip line array is only free'd in the destructor, so if it's already allocated we shouldn't allocate it again. Reviewed-by: Denis Dzyubenko
| * Make QVectorPath::controlPointRect() return a QRectF.Samuel Rødal2009-06-104-16/+13
| | | | | | | | | | | | This makes debugging etc much easier, plus most of the places controlPointRect() was called the caller had to convert the rect to a QRectF manually.
| * QPainter::worldTransform() does not return identity matrix.Bjørn Erik Nilsen2009-06-103-31/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPainter::worldTransform() does not return identity matrix when created on a redirected widget. It should always be identity by default, and should only change as a result of QPainter::setWorldTransform. The reason it didn't return identity for redirected widgets, was that we translated the shared painter's world matrix directly. Since we cannot modify the world matrix directly, we have to store the shared painter's current world transform in a separate matrix (redirectedMatrix), reset the world transform to identity, and later combine the redirectedMatrix with world transforms set on the painter. Note that redirection_offset was in negative coordinates before, and that redirectionMatrix now is in positive coordinates, hence opposite signs around. Auto-test included. Reviewed-by: lars Reviewed-by: Samuel
| * Merge commit 'qt-mainline/master' into master-recursivepaintAndreas Aardal Hanssen2009-06-108-57/+12
| |\
| | * Made QListWidgetItem::operator<() check if the data is numerical when comparing.J-P Nurmi2009-06-101-1/+4
| | | | | | | | | | | | | | | Merge-request: 631 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * Added QAbstractItemModelPrivate::canConvertToDouble().J-P Nurmi2009-06-104-45/+2
| | | | | | | | | | | | | | | | | | | | | | | | And changed QTreeWidgetItem::operator<() and QTableWidgetItem::operator<() to use it Merge-request: 631 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| * | Revert "greatly speed up QTransform::mapRect() for projective transforms"Andreas Aardal Hanssen2009-06-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 72e083c98c3adb07bb1578fb7f28f121fc3f34ac. This test broke the tst_QTransform::projectivePathMapping autotest. Lars is looking into it; for now we take the patch out. Reviewed-by: Lars
| * | Merge commit 'qt-mainline/master' into master-recursivepaintAndreas Aardal Hanssen2009-06-1043-118/+300
| |\ \
| * | | Revert "implement equality operator in a more sane way"Andreas Aardal Hanssen2009-06-101-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 07dca7a30d4bd1efd8032915700420cca3fd60fa. Move the equality operator code back in (qFuzzyCompare) to avoid breaking many autotests. The change should go back in later on, possibly supplemented by a qFuzzyCompare(QTransform) function. But until we can figure out how to not break everything this patch has to wait. Reviewed-by: Lars
| * | | Fix sorting bug when using BSP tree index + add autotest.Andreas Aardal Hanssen2009-06-092-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use stable sorting to keep insertion order. This works fine as long as we sort a complete list of siblings in one go, and this list already has items in insertion order. But if we shuffle such a list, the only way to get proper sort order again (with insertion order intact), is if each item has a sibling index. We used to have this, but we don't have it anymore (as it's not needed for NoIndex mode). So until we separate the BSP index into a separate class and add this index there, we add this workaround which uses the toplevelitems list to ensure the items have the correct order. Reviewed-by: bnilsen