summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Remove used variableOlivier Goffart2009-05-272-4/+1
| | | | | | olsFrameStyle was old. Reviewed-by: jbache
* Integrate merge-request #419 into branch 'master'Simon Hausmann2009-05-271-0/+1
|\ | | | | | | | | | | | | | | | | | | Daniël (1): Memory of fixedKernel is never returned, found by cppcheck. Request-url: http://qt.gitorious.org/qt/qt/merge_requests/419 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Merge commit 'd8a2e52e4db873a2cfd39630df47b61bec502fd1' into HEAD
| * Memory of fixedKernel is never returned, found by cppcheck.Daniël2009-05-271-0/+1
| |
* | 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
* | Add comparation of images with indexed colorBenjamin Poulain2009-05-271-5/+5
| | | | | | | | | | | | | | | | Previously, two images with indexed colors were not equal if their color tables were not the same. The image are not compared by the value of the pixels Reviewed-by: Samuel
* | Make WA_TranslucentBackground work on QGLWidget for X11Tom Cooksey2009-05-271-9/+22
| | | | | | | | | | | | | | This patch enables QGLWidget's to have an ARGB visual on X11, alowing GL rendering on semi-transparent windows. Reviewed-By: Trond
* | Optimized QRasterPixmapData::metric.Samuel Rødal2009-05-271-11/+22
| | | | | | | | | | | | | | | | | | | | Avoid needless DPI calculations when not needed, and simplify the DPI calculations to the point where most of the operations disappear. Also avoid calling QImage::metric() so that we don't need to go through two switch statements and an extra function call just to get the width of a pixmap. Reviewed-by: Trond
* | Avoid deep copies of pixmaps when using cache in QGraphicsView.Alexis Menard2009-05-271-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | When we have already a pixmap of an item in the cache, we should remove the entry from the cache otherwise when we will repaint/modify the copy of the pixmap (the copy of the cache) then we will trigger a deep copy ; this is because both entries in the cache and our copy share the same data and if you modify one of them a copy is triggered. I have added a benchmark as well to test that. Reviewed-by:bnilsen Reviewed-by:andreas
* | Do not use the locale in QDoubleSpinBoxPrivate::roundOlivier Goffart2009-05-271-3/+1
| | | | | | | | | | | | | | | | | | | | We had a report from a customer saying this breaks if the decimal separator is the same as the group separator. This is not really something we want to support, but because this fix is easy and cleanup the code I decided to fix it. Reviewed-by: Thierry Task-number: 253962
* | doc updateThierry Bastian2009-05-262-40/+186
| | | | | | | | no more warnings while generating the docs
* | some cleanups on private exported symbolsThierry Bastian2009-05-2611-35/+14
| |
* | We first remove the pixmap from the cache and then release the keyAlexis Menard2009-05-261-1/+3
| | | | | | | | | | | | | | If we don't remove the pixmap from QCache first then the key is invalid and the removal failed Reviewed-by: sroedal
* | Fix all docs warnings and add since 4.6 to new methodsAlexis Menard2009-05-251-7/+22
| | | | | | | | Reviewed-by:TrustMe
* | Some refactoring of windows specific code + a private class of animationsThierry Bastian2009-05-252-32/+12
| |
* | Fix a warning on MSVCThierry Bastian2009-05-251-1/+1
| |
* | Compile fixThierry Bastian2009-05-252-2/+2
| |
* | Fixed 'crazy' warnings about using a string instead of a characterThierry Bastian2009-05-2551-141/+140
| | | | | | | | | | | | | | 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-2534-119/+2436
|\ \
| * | Added a "Qt 5 FIXME" comment to qmessagebox.h.jasplin2009-05-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMessageBox::question() has the wrong default value for one of its arguments, but fixing it may break existing code, and the workaround is trivial (just specify an explicit value for the default argument). Reviewed-by: TrustMe Task-number: 254131
| * | Fix a mistake in the doc.Alexis Menard2009-05-251-2/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Disable the SH_Menu_AllowActiveAndDisabled on plastique style.Olivier Goffart2009-05-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This restore the KDE3's behaviour. Do not disable it on Windows as we are aware of customer using the QPlastiqueStyle on Windows that might rely on this (for behaviour consistancy with others Windows applications) Reviewed-by: jbache Task-number: 254210
| * | Merge branch '4.5'Thiago Macieira2009-05-223-8/+11
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp
| | * | Pressing enter in a QPlainTextEdit embedded on a itemview should insert a ↵Olivier Goffart2009-05-222-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | newline Do the same special case as for QTextEdit (yes, this is a pitty that we have special cases like that Reviewed-by: Thierry Task-number: 252532
| | * | Fixes a potential crash when changing system palette with QGtkStyleJens Bache-Wiig2009-05-221-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we installed an eventfilter regardless if the gtk symbols were defined or not. Instead we now initialize and check for the symbols before we install the filter. Task-number: 254342 Reviewed-by: ogoffart
| * | | Fix build on Solaris for qHash function in QPixmapCache.Alexis Menard2009-05-222-1/+3
| | | | | | | | | | | | | | | | Reviewed-by:thierry
| * | | Merge branch '4.5'Thiago Macieira2009-05-225-52/+35
| |\ \ \ | | |/ /
| | * | Fixed potential bug caused by change b89efc8e7f32.Samuel Rødal2009-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If ensureSpace causes the layoutData to reallocate then the initialGlyphs pointers will no longer be valid. Reviewed-by: Simon Hausmann
| | * | Fixed text shaping bugs with ligatures and multiple font engines.Samuel Rødal2009-05-221-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Harfbuzz shaping adds or merges glyphs we need to move the remaining glyphs in the glyph layout to compensate. Task-number: 253783 Reviewed-by: Simon Hausmann
| | * | Fix Qt does not compile when glibc < 2.3.2 on linuxJens Bache-Wiig2009-05-221-22/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than try to resolve functions or impose configure time limitations we simply remove the dependancy entirely and rely on the fallbac for all platforms. Task-number: 250731 Reviewed-by: thiago
| | * | Fixed an issue with text drawing to QImages on Mac/Cocoa.Trond Kjernåsen2009-05-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently don't support subpixel hinting when drawing text to a QImage on Mac. The alpha map that is returned by the font engine is a plain 8 bit gray mask, which means we have to switch off subpixel hinting when we draw the glyph for caching. Task-number: 249178 Reviewed-by: Samuel
| | * | 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 toolbutton text incorrectly clipped on windowsJens Bache-Wiig2009-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 4.5 the toolbutton icon rendering was changed somewhat and the bottom line of text for tool buttons icons with TextUnderIcon set is incorrectly clipped on Windows. The style reserves only 5 pixels but tries to use 6 pixels for text and icon spacing, hence we adjust the text rect one pixel up. This should be safe considering the fact that we have a margin on both sides of the icon already and avoids actually moving the icon positioning. Task-number: 252554 Reviewed-by: trond
| * | | Say hello to animation API and state machine API (now with history)Kent Hansen2009-05-2218-5/+1860
| |\ \ \
| | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-221-4/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | kinetic-animations
| | * \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-22261-10970/+14409
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | Fix missing/outdated license headers.Jason McDonald2009-05-219-19/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | remove QT_EXPERIMENTAL stuffKent Hansen2009-05-209-49/+10
| | | | | | |
| | * | | | | Removing QT_EXPERIMENTAL_SOLUTION from the animation apiLeonardo Sobral Cunha2009-05-191-5/+0
| | | | | | |
| | * | | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-142-0/+4
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-131-5/+0
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | * \ \ \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-1295-1183/+1765
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | * | | | | | | Merged local changes.David Boddie2009-04-292-0/+4
| | | | | | | | | |
| | * | | | | | | | Make QAbstractTransition::eventTest() non-constEskil Abrahamsen Blomfeldt2009-05-148-8/+8
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We decided to remove the const of the eventTest() since some transitions have dynamic conditions and need to update when eventTest() is called.
| | * | | | | | | kill the QT_STATEMACHINE_SOLUTION defineKent Hansen2009-05-131-5/+0
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | We won't release another Qt Solution, so the define is no longer needed.
| | * | | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Alexis Menard2009-05-1214-571/+154
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | | * | | | | | add event as argument to onEntry(), onExit() and onTransition()Kent Hansen2009-05-058-10/+10
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessing the event can be useful. E.g., onEntry() can do some common event processing regardless of which transition caused the state to be entered; onTransition() can be used in combination with eventTest(), where eventTest() would first check that the input matches some criteria, and then the actual processing of that input would be done in onTransition.
| | | * | | | | kill dead function declarationKent Hansen2009-04-291-1/+0
| | | | | | | |
| | | * | | | | rename QBoundEvent to QWrappedEvent and make it publicKent Hansen2009-04-293-23/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Result of API review.
| | | * | | | | modifiers --> modifiersMaskKent Hansen2009-04-298-24/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Result of API review. A == comparison of the modifiers is not useful. The common case is you want to test if one or more modifiers are set, i.e. a mask check.