summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-253-18/+8
|\ | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfile.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/network/socket/qnativesocketengine_p.h src/network/socket/qnativesocketengine_unix.cpp
| * 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
| * 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
| * 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 git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-202-1/+15
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: tests/auto/network-settings.h tests/auto/qhttpsocketengine/tst_qhttpsocketengine.cpp tests/auto/qiodevice/tst_qiodevice.cpp tests/auto/qnativesocketengine/tst_qnativesocketengine.cpp tests/auto/qsocks5socketengine/tst_qsocks5socketengine.cpp tests/auto/qsslsocket/tst_qsslsocket.cpp
| * 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 branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-185-17/+32
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: configure.exe src/corelib/kernel/qcoreapplication.cpp Configure.exe not rebuilt because the changes are irrelevant for the S60 port. We'll rebuild it before merging back.
| * 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
| * 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
| * 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
| * Fixes a code snippet for QPainter::xFormDev()Andy Shaw2009-05-111-2/+2
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJanne Koskinen2009-05-1138-670/+2204
|\ \ | | | | | | | | | | | | Conflicts: src/gui/widgets/qmenu_symbian.cpp
| * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-1111-245/+302
| |\ \ | | |/ | | | | | | | | | Conflicts: tests/auto/qtemporaryfile/qtemporaryfile.pro
| | * 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
| | * 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
| | * Prevented X server crash when calling XFillPolygon with >200000 points.Samuel Rødal2009-05-061-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't know why the X server crashes, but it's reproducible both by us and customers so we should fall back to the raster paint engine to avoid the crash. Task-number: 244362 Reviewed-by: Trond
| | * Fixed some inconsistencies for image drawing on non-integer coords.Samuel Rødal2009-05-062-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | Don't use aliased coordinate delta for image drawing. Related to change fde7475bcf9c10522a8170e6eb8fb9a8fadc21cd. Task-number: 251561 Reviewed-by: Trond
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-05-0611-51/+144
| |\ \ | | |/
| | * Ensured correct rounding of scaled image drawing at non-integer coords.Samuel Rødal2009-05-052-25/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Images coordinates should simply be rounded and are not to be subject to the aliased coordinate delta. The patch also adds a tiny delta in QSpanData::setupMatrix() to ensure coordinates for fetching from source images are rounded the opposite direction of the target rectangle. This removes a lot of artifacts when trying to do border-image based drawing on non-integer coordinates. A new qps test for border-image drawing is included. Task-number: 251561 Reviewed-by: Trond
| | * Fixed bug where 0-opacity would cause images to be drawn fully opaque.Samuel Rødal2009-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The bug appears in the raster paint engine and only in release mode as the cause of the bug is in the MMX and SSE blend functions which are disabled in debug. To prevent it simply we return early if we detect that we have an opacity of 0. Reviewed-by: Trond
| | * Fix regression in drawing parts of pixmaps on Panther.Norwegian Rock Cat2009-05-051-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The width of a pixmap is NOT the same as the bytes per row. We may have been able to do that in the past, but it doesn't work in the general case. I also took the liberty to introduce a QCFType to automatically handling the free in the general case. Task-number: 252176 Reviewed-by: sroedal
| | * Support rotated displays with 15 and 16 bit BGR pixel formats.Paul Olav Tvete2009-05-052-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | To avoid increasing code size for an uncommon case, the code is #ifdef QT_QWS_ROTATE_BGR Task-number: 250299 Reviewed-by: Tom
| | * Added an assert so that QColormap usage without a QApplication asserts.Trond Kjernaasen2009-05-041-1/+5
| | | | | | | | | | | | | | | Task-number: 252668 Reviewed-by: Samuel
| | * QTransform::map(const QRegion&) cut-off for single rect regions.Bjoern Erik Nilsen2009-04-291-0/+4
| | | | | | | | | | | | | | | | | | Avoid QRegion<->QPainterPath conversion if possible. Reviewed-by: Samuel
| | * Speed-up QPainter::clipRegion().Bjoern Erik Nilsen2009-04-291-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | We can speed up the calculation by using rect intersections if possible, i.e. QRegion &= QRect instead of QRegion &= QRegion. Then we'll get rid of one QRegion construction and the intersection itself is slightly faster. Reviewed-by: Samuel
| | * Mac: Fixes a crash in tst_QWidget::updateOnDestroyedSignalBjoern Erik Nilsen2009-04-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addendum to change 9b674ddcea7c0ff7912f185474b7d98bc83bd39f. The problem was that QWidget::paintEngine() (pure virtual) was called while being in the destructor. The use-case itself (see above change) is very very corner case, but still, it shouldn't crash. Reviewed-by: bnilsen
| | * Fixed rendering of bitmap fonts on X11 with Xrender and fontconfig.Trond Kjernåsen2009-04-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | It seems the Xrender PictStandardA1 mask format doesn't work with XLFD bitmap fonts wrapped in a fontconfig structure. Task-number: 252328 Reviewed-by: Samuel
| | * Fixes wrong QPaintEvent::region() in QGLWidget::paintEvent.Bjoern Erik Nilsen2009-04-271-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidget does not support partial updates unless the context is single buffered and auto-fill background is disabled. The problem was that QPaintEvent::region() returned the requested update region without taking into account the limitation of QGLWidget. If QGLWidget doesn't support partial updates, it means everything has to be updated, and QPaintEvent::region() must return the whole widget rect. Auto test included. Task-number: 241785 Reviewed-by: Trond
| | * Sometimes wrong clipping in QWidget::render() when passing a device orBjoern Erik Nilsen2009-04-242-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | an untransformed painter When passing a painter to QWidget::render, we use the painter->paintEngine()->systemClip() as the "system viewport", i.e. all painting triggered by render() should be limited to this area. The only way to achieve this is by always ensuring the system clip is clipped to the same area (systemClip &= systemViewport). The problem however, was that we only did this for transformed painters. We must of course always do it when there's a systemViewport set, regardless of whether the painter is transformed or not. Auto test included. Task-number: 248852 Reviewed-by: Trond
| * | Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicJanne Anttila2009-05-056-18/+1251
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-publicMiikka Heikkinen2009-05-051-8/+38
| | |\ \
| | * | | ARMV6 optimizations to qdrawhelperMiikka Heikkinen2009-05-056-18/+1251
| | | | |
| * | | | Implemented: 247278 Remove unnecessary includes from qbackingstore.cpp.Janne Anttila2009-05-051-5/+0
| | |/ / | |/| |
| * | | Merge commit 'private/translucentWindows'Jason Barron2009-04-301-8/+38
| |\ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: src/gui/styles/qs60style_symbian.cpp
| | * | Small optimization when hiding windows.Jason Barron2009-04-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a window is hidden, it will call releaseBuffer() on the backing store which in turn will resize the window surface to a null rect. In this case, there is no need to update the QImage with the data pointer since it will be updated on the subsequent beginPaint() when the image is resized to a valid size again. This also avoids doing unnecessary locking on the FBSERV heap which still involves a context switch on older versions of Symbian.
| | * | Get transparency working by clearing the window surface.Jason Barron2009-04-281-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is duplicated code from the raster paint engine's beginPaint() function. For translucent windows the previous contents must be cleared from the backing store before the new content is painted. This class should probably be re-written as a subclass of the raster version. The reason we cannot use that implementation directly is because we cannot use QNativeImage because it doesn't provide anywhere we can do locking.
| | * | More work on translucent windows.Jason Barron2009-04-281-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One step closer to semi-transparent windows, but not there yet. This gets the transparent contents into the window, but the previous contents are not cleared so it keeps drawing the backing store on top of itself each time a Draw() is done. SetBackgroundColor() indicates to WSERV that our window is semi-transparent. We also make sure not to use 'EDrawModeWriteAlpha' when the widget is non-opaque since this actually changes the alpha channel on the frame buffer (not the window) so the gives undesired results. It's a faster draw mode though so we should use it where we can.
| | * | Fixes: Add support for translucent windows in Symbian.Jason Barron2009-04-281-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warning, this is completely untested! Details: This should (in theory) get translucent windows working but this hasn't been tested yet. The emulator environment seems to return only 16ColorMU display modes which implies the window is opague so Qt ignores the translucent flag. HW seems to create 16ColorMA windows, but it hasn't been tested there yet either (no time).
| * | | Basic optimizations to qdrawhelper for RVCT builds:Miikka Heikkinen2009-04-292-37/+69
| |/ / | | | | | | | | | | | | | | | | | | - Force static inline methods to be actually inline - Force ARM code for strategic methods RevBy: axis
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-2722-310/+404
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure.exe recompiled with MSVC6. Conflicts: configure.exe examples/network/network.pro src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qfilesystemmodel_p.h src/gui/kernel/qapplication.cpp tests/auto/_Categories/qmake.txt tests/auto/qfile/test/test.pro tests/auto/qfile/tst_qfile.cpp tests/auto/qlibrary/tst_qlibrary.cpp tests/auto/qline/tst_qline.cpp tests/auto/qstyle/tst_qstyle.cpp tests/auto/qtextstream/tst_qtextstream.cpp tests/auto/qtranslator/qtranslator.pro tests/auto/qwaitcondition/tst_qwaitcondition.cpp translations/qt_ja_JP.ts
| | * Fix clipping bug in raster paint engineGunnar Sletta2009-04-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we have a rect-clip where we actually had spans (used for cleartype) and then reused that clipdata, we would never re-create the spans, which would mean that future drawing would be filtered based on the old clip Reviewed-by: Samuel
| | * Prevent QTransform::type() from returning TxScale instead of TxProject.Samuel Rødal2009-04-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | We have code that assumes that m33 = 1 if the type is TxScale. Instead of changing all that code it's better to just return TxProject as type when m33 is different from 1. Reviewed-by: Simon Hausmann
| | * Fix QPrinter::pageRect() for Windows printers, when fullPage() is set.Trond Kjernåsen2009-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | When QPrinter::fullPage() was set, pageRect() returned the same as paperRect(). Under Windows, there is always a non-printable area that was not taken into account in the fullPage() case. Task-number: 248881 Reviewed-by: Kim
generated by cgit v0.12 at 2025-01-10 04:19:44 (GMT)