summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'qt-mainline/master' into master-recursivepaintAndreas Aardal Hanssen2009-06-1063-462/+887
|\
| * add some api docs to clarify what collate doesThomas Zander2009-06-101-0/+3
| |
| * small code cleanup that improves some loopsThierry Bastian2009-06-109-28/+43
| | | | | | | | it uses les foreach
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtJason McDonald2009-06-101-2/+2
| |\
| | * Fixed clipping bug in raster paint engine causing rendering artifacts.Samuel Rødal2009-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | The artifacts were visible in the mainwindow demo when dragging the top toolbar separator left and right. We need to check that rect clipping is actually activated before we compare the new clip rect with the old, otherwise the clip type and clip bound flags won't get updated.
| * | Fix some incorrect license headers.Jason McDonald2009-06-1012-12/+12
| |/ | | | | | | | | | | | | The MODULE placeholder shouldn't be used anymore, and neither should the old Trolltech license header. Reviewed-by: Trust Me
| * Fix license headers for QStringBuilder.Jason McDonald2009-06-102-12/+12
| | | | | | | | | | | | | | Only release branches are allowed to have the Commercial usage header. All other branches must have the No Commercial Usage header. Reviewed-by: Trust Me
| * Opening links with cyrillic file names does not work in QLabel.Prasanth Ullattil2009-06-091-0/+3
| | | | | | | | | | | | | | | | | | QDestopServices was converting the file names to percentage encoding before calling ShellExecute. This will not work with URLs without a scheme. These are now being treated similar to a file. Task-number: 254501 Reviewed-by: Jens Bache-Wiig
| * Add support for TIFF formats (Mono and indexed)Benjamin Poulain2009-06-091-83/+259
| | | | | | | | | | | | | | | | | | | | Add support for reading and writing for Mono, MonoLSB and Indexed images in the tiff format. Previously, the images were always written in RGB32, dismissing the input format. Task-number: 254317 Reviewed-by: Samuel
| * Implemented the NET_WM_SYNC protocol on X11.Denis Dzyubenko2009-06-094-2/+127
| | | | | | | | | | | | | | | | Done with Thorbjørn Lindeijer Task-number: 220550 Reviewed-by: Thorbjørn Lindeijer Reviewed-by: mae
| * Improves the documentation of QHeaderView::setResizeMode to specifyThierry Bastian2009-06-091-1/+2
| | | | | | | | | | | | that the section indicated by the parameter logicalIndex should exist Task-number: 255541
| * removed foreach usage from animation APIThierry Bastian2009-06-091-14/+19
| |
| * small changes in private headersThierry Bastian2009-06-095-11/+4
| |
| * qdoc: The gray version.Martin Smith2009-06-091-1/+1
| |
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-06-0936-412/+510
| |\
| | * small improvement/refactor to cssparserThierry Bastian2009-06-092-42/+1
| | |
| | * small change to reduce static data sizeThierry Bastian2009-06-092-2/+2
| | |
| | * Prevented pixmap FBOs from growing too big.Samuel Rødal2009-06-091-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | If we're painting to very wide and then very tall pixmaps we don't want the FBO to grow to max_width * max_height, instead we should recreate the FBO if it grows too large compared to what's being painted. Reviewed-by: Trond
| | * Optimized stencil buffer clearing in GL 2 paint engine.Samuel Rødal2009-06-092-42/+9
| | | | | | | | | | | | | | | | | | | | | | | | Based on Zack's patch, 17e1bca1ce366395f8331e16aa96b7176ca1abac. Instead of manually clearing the stencil buffer after drawing we simply do the clearing and drawing in one go. Reviewed-by: Trond
| | * Resolved FBO extensions as well when resolving GL 2 extensions.Samuel Rødal2009-06-091-0/+3
| | | | | | | | | | | | | | | The new GL 2 text drawing requries the FBO function pointers to be resolved.
| | * Improved clipping in GL2 paint engine.Samuel Rødal2009-06-097-186/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the stencil method to draw clip paths and regions to the Z-buffer instead of using glClear / glScissor. Using different depth values for the various clip parts also makes restore() very cheap when only IntersectClip is used. As an additional bonus this patch gives antialiased clip in the GL 2 paint engine. Task-number: 254658 Reviewed-by: Trond
| | * Fix floating point exception in QImageReader::setScaledSize(QSize(0, 0))Leonardo Sobral Cunha2009-06-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Avoid a division by 0 when doing QImageReader::setScaledSize(QSize(0, 0)) for jpeg formats. Reviewed-by: thierry Task-number: 255627
| | * Fix focus frame on combobox on non-Windows stylesOlivier Goffart2009-06-093-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | State_KeyboardFocusChange only makes sens on Windows. Follow the logic on the combobox as in PE_FrameFocusRect in the QWindowsStyle Task-number: 255482 Reviewed-by: jbache
| | * small refactoring to reduce memory usage of static dataThierry Bastian2009-06-094-11/+10
| | |
| * | Doc: Fixed QWebPage::forwardUnsupportedContent documentation and addedDavid Boddie2009-06-093-11/+22
| | | | | | | | | | | | | | | | | | more information about Web plugins. Reviewed-by: Trust Me
* | | 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
* | | Remove duplicated code for removing an item from the scene.Bjørn Erik Nilsen2009-06-095-140/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | Before we had almost two identical functions for removing an item from the scene. There was only minor differences depending on whether the item was removed from QGraphicsScene::removeItem or from the item's destructor. Now we have one function that handles both cases just fine. Reviewed-by: Andreas
* | | Remove one unnecessary argument from the recursive draw function.Andreas Aardal Hanssen2009-06-093-11/+7
| | | | | | | | | | | | | | | We don't have to pass optimization flags; we already have a member variable we can test for painter state protection.
* | | Fix moving regression for ItemIgnoresTransformations items.Andreas Aardal Hanssen2009-06-091-1/+9
| | | | | | | | | | | | | | | | | | Removes a piece of code in 775ec8e96c9219981ff220ca5f3d24f0501d17b5 that was submitted by accident. The code in mouseMoveEvent is now identical to that in master.
* | | Fix QGraphicsView::render() regression, ensure the right device is passed.Andreas Aardal Hanssen2009-06-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | If we pass the viewport widget as the widget pointer when rendering to an arbitrary painter (e.g., onto a pixmap), we confuse the rendering functions to thinking that it's the viewport's region we should render into. So instead, when drawItems() is passed a painter that's different from the view, we pass 0 for the widget.
* | | Revert 7aee2a7054d1ca280f6dfc9c46b3fe2ce403ccb3, fix render bugs.Andreas Aardal Hanssen2009-06-092-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduced an unexpected interdependency for scenes with items that enable ItemStacksBehindParent, and that contain children that are transformed. There's a manual test for this, called clippingAndTransformations, which shows this problem. The bug has been fixed and this change also includes an autotest that covers exactly this problem.
* | | Add ItemSendsGeometryChanges, replacing itemChangeEnabled().Andreas Aardal Hanssen2009-06-095-72/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag toggles whether we should send notifications for setPos, setMatrix, and setTransform. It's off by default. Docs have been updated. All autotests pass. This change also cleans up a bit so that we both have readable code, and keeping the optimized path for when we need to send the notifications. By enabling this flag by default we are going to trigger regressions in end-user code. Reviewed-by: bnilsen
* | | Auto-test to ensure moved items don't leave traces.Bjørn Erik Nilsen2009-06-091-1/+2
| | | | | | | | | | | | See also: 1c9032f29d4500b33622d7510b6361c99d9af296
* | | Revert "Add QGraphicsItem::itemChangeEnabled()."Andreas Aardal Hanssen2009-06-094-198/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0fc58ca3220083b9e10f88aab2e39824c2764db3. Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h
* | | Fix two regressions in Plasma. The painter state proctection was notAlexis Menard2009-06-092-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly pass to drawItemHelper. The second is a double conversion to deviceTransform in createStyleOption of QGraphicsItem. Since the recursive drawing already give a transform in device mode we don't need to convert it two times. Reviewed-by:andreas
* | | Add (back) properties to QGraphicsItem to change the transformations componentOlivier Goffart2009-06-096-109/+517
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reapply commit 8ad5020940f10d4ecc5c5e8b3b9656531cb84ef3 and its dependent change that has been reverted while rebasing the recursivepaint branch. With the new properties it is possible to easily animate transformations Reviewed-by: Andreas Documentation still need to be reviewed.
* | | A partial QGraphicsItem update causes a full update to be discarded.Bjørn Erik Nilsen2009-06-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | E.g. item->update(QRectF(0, 0, 5, 5)); item->update(); The problem was that we discarded all update requests whenever the item was already marked as dirty. The dirty bit only means it has pending updates (which might be a full update). However, we have a separate bit for full updates (fullUpdatePending) so we have to check against that bit instead. Makes tst_QGraphicsProxyWidget::paintEvent happy. Another auto-test included.
* | | QGraphicsItem discard updates when it shouldn't.Bjørn Erik Nilsen2009-06-092-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Once a _q_processDirtyItems call is queued, it means we at least have one item that is marked as dirty and we must reset it when the _q_processDirtyItems slot is called. The problem however, was that we didn't reset the item's dirty state if a full scene update occurred in between, i.e. item->update(); scene.update(); We don't have to calculate the item's dirty rect if a full scene update occurs in between, but we still have to reset its state. Auto-test included.
* | | Child items leave traces when moving an ancestor item.Bjørn Erik Nilsen2009-06-091-1/+6
| | | | | | | | | | | | | | | The problem was that we only marked the painted view bounding rect of the moved item as dirty. We also have to mark its children.
* | | Fix warning.Alexis Menard2009-06-091-2/+2
| | |
* | | Fix interaction with QGraphicsWidgets that are a window.Andreas Aardal Hanssen2009-06-091-1/+1
| | | | | | | | | | | | Use itemCollidesWithPath, the helper function.
* | | Fix tst_QGraphicsScene::items_QRectF_2(), an intersection bug.Andreas Aardal Hanssen2009-06-091-1/+1
| | | | | | | | | | | | | | | The recursive items function didn't contain the special case check for when the source and target rectangle are identical.
* | | Fix tst_QGraphicsScene::itemIndexMethod(), typo in estimateItemsInRect()Andreas Aardal Hanssen2009-06-091-1/+1
| | | | | | | | | | | | Don't skip all indexed items that aren't transparent ;-).
* | | Fix tst_QGraphicsView::cursor2() - sorting bug when using BSP tree.Andreas Aardal Hanssen2009-06-091-2/+2
| | | | | | | | | | | | | | | | | | Make sure we don't claim that we have sorted all toplevel items when we are using the BSP tree, as when painting we have only actually sorted a subset of the elements.
* | | Removes odd artifact in the chip demo.Bjørn Erik Nilsen2009-06-092-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling repaint() instead of update() is bad when having multiple views (which GV perfectly supports). The result is that e.g. when moving a chip in the chip demo, there's a visible lag between each view. It can also be a performance killer on QWS, where the surface is locked for each repaint(). Instead of calling repaint() we call update() as before, but we also make sure the updates are processed immediately.
* | | Make sure the dirty state of an item is reset when removed from the scene.Bjørn Erik Nilsen2009-06-091-0/+2
| | | | | | | | | | | | Makes tst_QGraphicsItem::paint happy.
* | | Discard updates outside the bounding rect.Bjørn Erik Nilsen2009-06-092-1/+4
| | | | | | | | | | | | Makes tst_QGraphicsItem::cacheMode happy.
* | | Compatibility fix for QGraphicsScene::changed signal.Bjørn Erik Nilsen2009-06-092-3/+22
| | | | | | | | | | | | | | | Makes tst_QGraphicsScene::changedSignal and tst_QGraphicsItem::setMatrix happy.
* | | Make sure we reset the updateAll variable correctly.Bjørn Erik Nilsen2009-06-091-0/+1
| | | | | | | | | | | | Makes tst_QGraphicsScene::update happy.