summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Collapse)AuthorAgeFilesLines
* Fix crash in QPixmapCache.David Faure2009-10-191-0/+1
| | | | | | | QCache destruction accesses the key array that was freed in the QPixmapCache destruction, so better clear() before deleting that key. Merge-request: 1820 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-192-0/+8
|\
| * Use the fallback icon theme name, if the system icon theme name can not be ↵Robert Griebl2009-10-151-0/+4
| | | | | | | | | | | | | | | | determined. This restores the behavior from before the the gui plugin merge. Reviewed-by: Olivier Goffart
| * Fix themed icon loader on DEs other than KDE and Gnome.Robert Griebl2009-10-151-0/+2
| | | | | | | | | | | | Make sure that we at least try to load an icon via the "hicolor" theme. Reviewed-by: Olivier Goffart
| * Second attempt: Fixed a few compiler warnings from QtGui for Symbian.Janne Anttila2009-10-131-0/+2
| | | | | | | | | | | | | | The previous commit 9c6e466dc09813dd4a641b2cf385f35ac99346f5 included some changes which were not meant to be pushed. Reviewed-by: TrustMe
| * Revert "Fixed a few compiler warnings from QtGui for Symbian."Janne Anttila2009-10-131-2/+0
| | | | | | | | | | | | Accidentally used git commit -a when should have used only git commit :( This reverts commit 9c6e466dc09813dd4a641b2cf385f35ac99346f5.
| * Fixed a few compiler warnings from QtGui for Symbian.Janne Anttila2009-10-131-0/+2
| | | | | | | | Reviewed-by: TrustMe
* | Fixed QPainter::begin() so that it fails gracefully.Kim Motoyoshi Kalland2009-10-151-0/+3
| | | | | | | | | | | | | | | | | | | | Fixed QPainter::begin() so that if it fails, it can still be used on other paint devices without causing an assert. Autotest included. I also made begin() fail on images with the QImage::Format_Indexed8 format and added warnings in the documentation since painting on such images is not supported. Reviewed-by: Trond
* | Optimized raster drop shadow filter to only blur alpha channel.Samuel Rødal2009-10-151-24/+27
| | | | | | | | Reviewed-by: Gunnar
* | Added qt_toRasterPixmap functions.Samuel Rødal2009-10-141-0/+23
| | | | | | | | | | | | | | Similar to the existing qt_toX11Pixmap, this lets us explicitly create pixmaps with the raster pixmap backend. Reviewed-by: Gunnar Sletta
* | Added QPixmapData::createCompatiblePixmapData() used by QPixmap::copy().Samuel Rødal2009-10-149-8/+38
| | | | | | | | | | | | QPixmap::copy() now returns a pixmap with the same pixmap backend. Reviewed-by: Gunnar Sletta
* | Fixed documentation of QPixmap::x11Info() to not talk about widgets.Samuel Rødal2009-10-121-5/+5
| | | | | | | | Reviewed-by: Trond
* | Fixed bug where calling fill on pixmap with active painter would crash.Kim Motoyoshi Kalland2009-10-091-0/+10
|/ | | | | | | | | | | Calling QPixmap::fill() on a pixmap may in some cases cause the painter's paint engine pointer to become stale. A subsequent call to the painter would therefore crash. Now, QPixmap::fill() will print a warning and return in those cases. I also added a warning in the documentation of QPixmap::fill(). Task-number: QTBUG-2832 Reviewed-by: Trond
* Fix to Symbian accelerated scrolling problem.Jani Hautakangas2009-10-082-28/+21
| | | | | | | | | | The reason for scrolling bug was that CFbsBitmapDevice wasn't informed if CFbsBitmap was resized. However, it seems that scroll implementation in QRasterPixmapData is faster that CFbsBitGc->CopyRect so this is also a patch which changes QS60PixmapData's scroll function to call QRasterPixmapData::scroll(). Reviewed-by: Janne Koskinen
* QGuiPlatformPlugin: QFileIconProvider and QIcon backend.Olivier Goffart2009-10-072-82/+11
| | | | | | | | | | | | | | | Add a backend for QFileIconProvider in the platform plugin Also change the QIcon::fromTheme backend in the platform plugin: On KDE, we unfortunately can't use KIcon as backend, as the current API doesn't let us know easily (and quickly) wether we should use the fallback or not (KDE always fallback to the question mark "unknown" icon) So we will use the QIconLoader even on KDE. But we need to make sure that the theme name and the icon search paths are correct. Ask that to the platform plugin Reviewed-by: Jens Bache-Wiig
* Integrate the GuiPlatformPlugin interfaceOlivier Goffart2009-10-071-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | This is an internal interface for plugins that can be provided by the platform to give platform-specific features by platforms built on top of Qt. We can easlily integrate Qt on Windows, Mac, Gnome, ... without any plugin because we can link to their respective library (dynamically if we don't want to depend on it). On Gnome, we can dynamically resolve Gtk+ symbols. This is however not possible for KDE or other platform built on top of Qt: we can't link against their library because they depend on us and we can't dynamically resolve the symbols because they are mangled (C++) So this plugin provides hooks inside Qt to be able to do things like native File or Color dialog, native icons, accurate reading of the config file, and so on. This is currently private API. Task-number: QT-406 Reviewed-by: Jens Bache-Wiig Reviewed-by: Oswald Buddenhagen
* Symbain crash fix for QPixmap->QImage conversion.Alessandro Portale2009-10-051-1/+6
| | | | | | | | | | | In some cases the QImage, returned by QS60PixmapData::toImage() image an invalid pointer. That led to reproducable crashes on 3.1 Device and Emulator when starting a drag in the FridgeMagnets demo. Jani Hautakangas created this fix and I tested it on 3.1 Device and Emulator confirming that the crash is gone. Rev-By: Jani Hautakangas Rev-By: Alessandro Portale
* Made X11 pixmap backend's fromImage() check for Qt::NoOpaqueDetection.Samuel Rødal2009-10-051-2/+9
| | | | Reviewed-by: Gunnar
* Made X11 QPixmap backend return proper pixmap in alphaChannel().Samuel Rødal2009-10-051-2/+5
| | | | Reviewed-by: Gunnar
* Make it possible to implement engine-specific drop shadow filtersRhys Weatherley2009-10-051-0/+10
| | | | | | | | | | | | It wasn't possible for the paint engine to override the drop shadow filter because QPixmapDropShadowFilter::draw() was not asking for an engine-specific filter object. Also, change the OpenVG filter to use vgGaussianBlur() instead of vgConvolve(), and draw the original image on top of the shadow. Task-number: QTBUG-4583 Reviewed-by: trustme
* doc: Fixed numerous qdoc errors.Martin Smith2009-10-021-2/+2
|
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-0210-50/+54
|\
| * Fixed QPixmap::fromImage when using Format_Mono for Symbian.Janne Anttila2009-10-011-3/+3
| | | | | | | | | | | | | | | | | | | | The intermediate sourceImage was stored to wrong QImage object (image instead of correct sourceImage). This made subsequent switch-case statement to fail because destFormat was set to QImage::Format_Invalid Autotest: Fixes QItemDelegate::decoration autotest Reviewed-by: Jani Hautakangas
| * Split EGL config selection & surface creation into seperate functionsTom Cooksey2009-10-012-0/+3
| | | | | | | | | | This is needed to implement render-to-pixmap on x11/EGL, which will also need to create an EGL surface for pixmaps.
| * Add Qt::RenderHint to control rendering operations.Bjørn Erik Nilsen2009-09-302-11/+6
| | | | | | | | | | | | | | | | | | | | | | We need a way to control various rendering operations. For example, whether quality is more important than performance, or the other way around. This change also replaces occurences of QPixmapFilter/QGraphicsEffect::BlurHint (introduced in 1a431e850893b6b162c833f4f148f090e2427dda) with Qt::RenderHint. Reviewed-by: Samuel
| * Fix a bug in QPixmapCache when the cache is trimmed by QCache.Alexis Menard2009-09-295-36/+42
| | | | | | | | | | | | | | | | | | | | | | There was a bug in QPixmapCache when QCache trims the content, some keys were not invalidated. The ifdef for WinCE (that i removed) was a wrong fix, it let the auto-test pass but it doesn't fix the bug. The approach here is to add a QPixmapCacheEntry that release the key it owns when QCache deletes it : we are now sure that nothing happen in our back. Reviewed-by:paul Reviewed-by:trond
* | Make 16-bit graphicssystem opengl workGunnar Sletta2009-10-021-1/+1
| | | | | | | | Reviewed-by: Eskil
* | Explicitly check for alpha pixels in X11 before making an alpha XPixmapGunnar Sletta2009-10-021-3/+30
|/ | | | Reviewed-by: Samuel
* doc: add some more \since 4.6 tagsVolker Hilsheimer2009-09-281-6/+12
|
* Fix qdoc errorsJason McDonald2009-09-281-0/+2
| | | | Reviewed-by: Trust Me
* Fix qdoc error.Jason McDonald2009-09-281-1/+1
| | | | Reviewed-by: Trust Me
* Fix qdoc errors.Jason McDonald2009-09-281-5/+6
| | | | Reviewed-by: Trust Me
* Doc: Added a note about Phonon.David Boddie2009-09-251-0/+4
| | | | Reviewed-by: Trust Me
* Added BlurType to blur graphics effect API.Samuel Rødal2009-09-242-13/+18
| | | | | | | | This lets the user control whether to use a fast dynamic blur when animating the radius of the blur for example, or to use a static high quality blur for one-time or constant radius blurring. Reviewed-by: Gunnar Sletta
* Modify functions for native pixmap data conversion on Symbian.Jason Barron2009-09-235-222/+235
| | | | | | | | | | | | | We need a way to support converion to and from multiple native pixmap types from multiple pixmap backends. Instead of adding more virtual functions to QPixmapData, make the existing one more generic but pass an opaque pointer and a type and do some internal casting. Currently this function is Symbian only, but could easily be extended to work on other platforms. Reviewed-by: Aleksandar Babic Reviewed-by: Jani Hautakangas
* fix QPixmap::fromWinHICON for Windows CE mobileJoerg Bornemann2009-09-221-3/+20
| | | | | | On WinCE GetIconInfo returns a 0 hotspot for the system icons, thus we cannot use this value to determine width / height of the icon. Instead, we use the icon's bitmap to get this information.
* QPixMap::fromWinHICON compile fix for Windows CEJoerg Bornemann2009-09-221-11/+12
| | | | Reviewed-by: thartman
* Cleanup convertHIconToPixmap() & loadIconFromShell32()miniak2009-09-222-43/+16
| | | | | | | | Replace convertHIconToPixmap() by QPixmap::fromWinHICON() Move loadIconFromShell32() to qwindowsstyle.cpp Merge-request: 1570 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* * QPixmap: Add toWinHICON() & fromWinHICON() methodminiak2009-09-223-4/+78
| | | | | | | | | | Duplicate QPixmap <-> HICON conversion code removed from qwidget_win.cpp & qsystemtrayicon_win.cpp. Task-number: 218533 Merge-request: 1570 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Corrected some license headers.Kim Motoyoshi Kalland2009-09-181-4/+34
| | | | Reviewed-by: Samuel
* Fix compilation and remove trailing whitespace.Jason Barron2009-09-181-140/+140
| | | | | | Fix compilation on systems that support the extended bitmap format. Reviewed-by: Jani Hautakangas
* Adding support for symbian graphics resources.Aleksandar Sasha Babic2009-09-185-2/+83
| | | | | | | | | | | | | | This enables us to convert from and to new Symbian type of graphics resource, namely SgImage. This only supported with the OpenVG graphics system. On other graphics systems this will return null QPixmap. Conflicts: src/corelib/global/qglobal.h src/gui/image/qpixmap.h src/gui/image/qpixmap_s60.cpp Reviewed-by: Jason Barron
* Introduce native Symbian bitmap support to QPixmapJani Hautakangas2009-09-187-126/+894
| | | | | | | | | This is done to reduce heap consumption and to give a possibility to share bitmaps across process. QPixmap maps to Symbian CFbsBitmap which is stored in Symbian font and bitmap server. Reviewed-by: Jason Barron
* Reduce overhead of paint engine-specific pixmap filtersRhys Weatherley2009-09-161-6/+3
| | | | | | | | | | | | | | | | | | | Engine-specific pixmap filters were being created, used, and destroyed every time draw() was called on QPixmapColorizeFilter, QPixmapBlurFilter, and so on. This had a heavy performance penalty and made it difficult for the GL paint engine to cache shaders from one request to the next. A generic filter can request an engine-specific filter that matches its parameters. The engine can either create a new one or return a previously allocated filter object. Ownership of engine-specific pixmap filter objects is moved to the paint engine itself. Reviewed-by: Andrew den Exter Reviewed-by: Michael Brasser Reviewed-by: Michael Goddard Reviewed-by: Sarah Smith
* QCursor support for Symbian OSShane Kearns2009-09-151-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Jason Barron Reviewed-By: Alessandro Portale Summary: QT_NO_CURSOR is now not defined for symbian builds Existing QCursor APIs are all supported New public API, QApplication::setNavigationMode, to allow the navigation mode to be set. I.E. on an S60 3.2 phone, some applications will want a virtual mouse cursor (web browser), while others are designed for keypad navigation. Symbian HAL is used for detecting input capabilities. Fix DND, code cleanup & comment QCursor visibility now uses a refcount, and is called from DND and the setNavigationMode so they are both simpler and don't interfere with each other. QApplication::setNavigationMode New public API for configuring cursor/keypad navi style. This links in with ongoing work on the 4-way keypad navi branch, but 2-way and 4-way modes both act as 2-way mode until that is integrated Some of the demos/examples have cursor switched on (those that were not usable with keypad) Virtual mouse support for non touch, non mouse phones (tested on N78) add *.d and .metadata (carbide debug file / workspace dir) to .gitignore System pointers are unavailable when using sprite workaround, so the system cursor shapes are compiled into qtgui as resources. MAC port does this also for shapes that aren't standard on the MAC. Refactor Drag'n'Drop to use QCursor Add test case to check all system cursor shapes Simply a mainwindow containing a label widget for each cursor shape, with the cursor property set appropriately QCursor(QBitmap,QBitmap) supported Fixed problem with the image & mask being inverted when using the QCursor constructor that takes two mono bitmaps. add .make.cache files to .gitignore Correct implementation of QApplication::setOverrideCursor QApplication::restoreOverrideCursor and QApplication::setOverrideCursor are now working correctly on Symbian platform. Performance will be slower compared with other platforms, because the Symbian window server has a cursor associated with each native window. Add test case for custom cursors Create a pixmap cursor and associate it with a widget. No changes to production code, since test passed 1st time ;) Add manual test for QCursor Make cursor independent of construction order Updated to work around window server issue where contruction order affects what cursor is displayed in child windows. Also changed to effectiveWinId following review comments Also fixed a problem which would make qcursor not link if configured with QT_NO_CURSOR Moved some multiply declared extern functions from cpp to _p.h files Implemented Symbian versions of the cursor functions. Merged in work I'd done based on tower. Fill in bits of stub functions based on windows port Removed QT_NO_CURSOR from list of config options forced on symbian Recompiled configure.exe Added stub functions for the missing functions in s60 port
* doc: Fixed some qdoc errors.Martin Smith2009-09-151-2/+1
|
* Added support in qimagereader to base plugin selection on stream contentGunnar Sletta2009-09-152-10/+49
| | | | Reviewed-by: Trond
* Add strength factor to the colorize filter.Ariya Hidayat2009-09-142-1/+53
| | | | | | | | | | | To allow fading between the original and the colorized version of the pixmaps, a new strength factor is introduced, 0.0 means the filter has no effect at all, 1.0 means full colorization. Still missing is the non-raster implementation. Autotest: included Reviewed-by: Bjørn Erik Nilsen
* Fix incorrect fallback for icon themesJens Bache-Wiig2009-09-091-18/+19
| | | | | | | | | When using themed icons, we incorrectly used the systemTheme as the fallback. This is not correct as the idea of the fallback was to use the generic "gnome" or "oxygen" themes if the proper theme was not available. Reviewed-by: joao
* Update license headers again.Jason McDonald2009-09-0963-252/+252
| | | | Reviewed-by: Trust Me
generated by cgit v0.12 at 2025-01-07 23:14:27 (GMT)