summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
Commit message (Collapse)AuthorAgeFilesLines
* Further optimized fast scaling of ARGB8565 images onto RGB16 images.Michael Brasser2009-05-282-5/+11
| | | | | | This improves performance on embedded. Reviewed-by: Samuel
* improved string operations all over the placeThierry Bastian2009-05-285-9/+9
| | | | | used character operations whenever possible better usage of QLatin1String
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-274-10/+18
|\ | | | | | | | | Conflicts: tests/auto/qtreeview/tst_qtreeview.cpp
| * BT: Fixed GL textdrawing in the Boxes demo.Trond Kjernaasen2009-05-261-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reworked the 85f98acaa3a38079071bea711e43c9a86edec1f6 fix, since it broke glyph positioning in the GL engine under Windows. Instead of changing the glyph cache margin, which impacts where the glyph is positioned, we just make the image the glyph is drawn into 4 pixels bigger in width/heigth. The margin in QImageTextureGlyphCache needs to be reworked.. Task-number: 254450 Reviewed-by: Eskil
| * Doc: Miscellaneous documentation fixes for Qt 4.5.x and later.David Boddie2009-05-251-4/+4
| | | | | | | | Reviewed-by: Trust Me
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-253-18/+8
| |\
| | * qdoc: Added some missing qdoc comments.Martin Smith2009-05-253-10/+8
| | | | | | | | | | | | Task-number: 252491
| | * qdoc: Added some missing qdoc comments.Martin Smith2009-05-251-0/+6
| | | | | | | | | | | | Task-number: 252493
* | | Optimized fast scaling of ARGB8565 images onto RGB16 images.Samuel Rødal2009-05-271-1/+58
| | | | | | | | | | | | | | | | | | | | | There was an optimized blend function for this case but not an optimized scale function. Performance increase seems to be in the order of 5x. Reviewed-by: Trond
* | | some cleanups on private exported symbolsThierry Bastian2009-05-262-2/+2
| | |
* | | Fix a warning on MSVCThierry Bastian2009-05-251-1/+1
| | |
* | | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-2512-46/+46
| | | | | | | | | | | | | | | | | | | | | Wherever I found that we were using a string instead of a single char I fixed the code. Reviewed-by: olivier
* | | Fixed bug in QPaintEngineEx::drawTiledPixmap fallback code.Samuel Rødal2009-05-251-1/+1
| | | | | | | | | | | | | | | | | | The brush transform needs to include the rect position. Reviewed-by: Trond
* | | Merge branch 'master' into graphics-masterTom Cooksey2009-05-252-18/+4
|\ \ \
| * \ \ Merge branch '4.5'Thiago Macieira2009-05-221-14/+0
| |\ \ \ | | | |/ | | |/|
| | * | Revert "Ignore GCC warning of unsafe floating point comparisons."Ariya Hidayat2009-05-221-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 30f7edc0aab629499b74263391ae529ad31b2ff8. There is no way to restore float-equal warning using the pragma trick. This means (as it was mentioned in the said commit log) anyone that includes qtransform.h will be forced to deal with float-equal. Reviewed-by: Samuel Rødal
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-2233-6456/+1194
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro
| * \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-1236-627/+901
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-17158-0/+110581
| / / / /
* | | | | Merge commit 'qt/master'Samuel Rødal2009-05-206-29/+42
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge commit 'origin/4.5'Samuel Rødal2009-05-201-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix a wrong compiler define (was a typo).Ariya Hidayat2009-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | The typo was in commit 30f7edc0aab629499b74263391ae529ad31b2ff8.
| * | | | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-201-16/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Doc: Fixed the paper sizes again.David Boddie2009-05-201-16/+16
| | |/ / | | | | | | | | | | | | | | | | Task-number: 254179 Reviewed-by: Norwegian Rock Cat
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-05-192-1/+15
| |\ \ \ | | |/ /
| | * | Ignore GCC warning of unsafe floating point comparisons.Ariya Hidayat2009-05-191-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to optimizations, there are few cases where comparing with a constant is needed, e.g. in operator*=. G++ will give us a warning for this. Since we know what we are doing, surpress the warning. The only drawback for this workaround is if somebody includes qtransform.h in his code and disable the float-equal warning since the warning will be activated again. Reviewed-by: Samuel Rødal
| | * | Fix some typos in the documentation.Frederik Schwarzer2009-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
| * | | Merge commit 'origin/4.5'Olivier Goffart2009-05-181-3/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.cpp src/corelib/kernel/qobject_p.h src/network/access/qhttpnetworkconnection.cpp
| | * | Fixed a bug which implicitly closed perspective transformed poly lines.Trond Kjernåsen2009-05-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the end point of a line in a path is clipped, only closed paths should have the closing line. Task-number: 253663 Reviewed-by: Samuel
| * | | Merge branch '4.5'Thiago Macieira2009-05-141-7/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: tools/macdeployqt/shared/shared.cpp
| | * | QColor::toCmyk() does not convert the color if it is already in CMYKBenjamin Poulain2009-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QColor::toCmyk() converted the color to RGB and then to CMYK. If the color was already in CMYK, this conversion change it. The color is now returned directly if it is in CMYK Reviewed-by: Ariya Task-number: 253625
| | * | Fixed an issue with text drawing under Windows.Trond Kjernaasen2009-05-141-7/+4
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Some text drawn with OpenType fonts where cut off by a pixel or two under certain circumstances. This adds an additional 2 pixel pad margin to the glyph cache entries. The padding behaves slightly different when ClearType is enabled/disabled, hence the general 2 pixel padding. Task-number: 246196 Reviewed-by: Samuel
| * | QColor::toCmyk() does not convert the color if it is already in CMYKBenjamin Poulain2009-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | QColor::toCmyk() converted the color to RGB and then to CMYK. If the color was already in CMYK, this conversion change it. The color is now returned directly if it is in CMYK Reviewed-by: Ariya Task-number: 253625
* | | Prevented QClipData related crashes.Samuel Rødal2009-05-151-2/+4
| | |
* | | Merge commit 'qt/master'Samuel Rødal2009-05-1318-283/+422
|\ \ \ | |/ /
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-131-3/+19
| |\ \ | | |/
| | * Fix handling of gradients on pens in the emulation paint engine.Kim Motoyoshi Kalland2009-05-121-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The handling of gradients with object bounding mode on pens in the emulation paint engine has been changed to agree with the SVG standard, where pen widths are ignored when calculating bounding boxes. Instead of converting strokes to fills and then transforming the gradients based on the fills' bounding box, the gradients are now transformed first based on the bounding box of the stroke path. Reviewed-by: Trond
| * | compilation fix for LinuxThierry Bastian2009-05-111-2/+2
| | |
| * | Merge branch '4.5'Thiago Macieira2009-05-111-2/+2
| |\ \ | | |/
| | * Fixes a code snippet for QPainter::xFormDev()Andy Shaw2009-05-111-2/+2
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Almost 200 symbols that didn't need to be exported.Thierry Bastian2009-05-112-4/+4
| | |
| * | Merge branch '4.5'Thiago Macieira2009-05-111-2/+2
| |\ \ | | |/
| | * Fixed a problem with QPrinter::NativeFormat printers not being valid.Trond Kjernåsen2009-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | It's obvious that not only PDF and PS printers are valid.. Task-number: related to 252873 Reviewed-by: Samuel
| * | Merge branch '4.5'Thiago Macieira2009-05-075-14/+27
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| | * Fixed a problem that caused QPrintDialog to invalidate QPrinter.Trond Kjernåsen2009-05-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | When passing a printer that is set up to print to a PDF file into QPrintDialog, the print dialog could invalidate the printer and not update the validity of it in a proper manner. Task-number: 252873 Reviewed-by: Samuel
| | * Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-072-4/+3
| | | | | | | | | | | | Reviewed-by: nrc
| | * Fixed some inconsistencies for image drawing on non-integer coords.Samuel Rødal2009-05-071-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for 1x1 source rect image drawing in change ffbb3c1a2aee4134dce80cd144a26bf32865b698 was incorrect for transforms with type >= TxScale. The aliased coordinate delta needs to be applied in device coordinates, not in logical coordinates. Also specialize the non-antialiased TxScale case by simply calling fillRect_normalized directly, avoiding having to scan convert the rectangle manually. Task-number: 251561 Reviewed-by: Trond
| | * Win: QLineEdit not updating correctly when embedded in Graphics ViewBjoern Erik Nilsen2009-05-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates triggered by the line edit itself, i.e. cursor blinking, are not processed after the top-level is resized. This is yet another problem caused by the event dispatcher on Windows (Qt posted events are not sent during top-level resize, task 146849). We added a work-around for that particular case by posting an event via Windows, but the widget is not visible on the screen (hidden from Windows' POV) so it'll never be posted. And of course then we'll never receive it and the backing store is not synced. This work-around is therefore useless for widgets that are not visible on the screen. However, not receiving update requests while resizing the top-level (in this case QGraphicsView), is not a problem for embedded widgets because all items and hence the proxied widgets are repainted by graphics view anyways. Task-number: 252400 Reviewed-by: Olivier
| | * qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-074-224/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. Task-number: 252496 252492
| * | qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-074-224/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. #Task-number: 252496