| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
The word 'module' was missing.
Reviewed-By: TrustMe
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Get rid of QGraphicsEffectSource from the public API, instead add
convenience functions in QGraphicsEffect. This way we commit to less
API, and are free to introduce a customizable QGraphicsEffectSource
in a future release.
* Move PixmapPadMode into QGraphicsEffect and tweak the names of the
enum values.
* Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility.
Reviewed-by: Bjørn Erik Nilsen
|
|
|
|
|
|
|
|
|
| |
The name numCols is ambiguous, as sometimes it's refering to the number
of columns, and sometimes the number of colors. It also does not match
the typical Qt naming convention *Count().
Reviewed-by: Tom Cooksey
Reviewed-by: Andreas Aardal Hanssen
|
|
|
|
|
|
|
|
|
|
| |
QPaintDevice and QImage used the functions numColors(), setNumColors(),
and numBytes(). However, this is not consistent with the rest of the Qt
API which uses *Count() and set*Count().
Removed all usage of these functions inside Qt and test-cases.
Reviewed-by: Andreas Aardal Hanssen
|
|\ |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It depends on QT_NO_GRAPHICSVIEW for now, but it is possible to remove
this dependency.
Reviewed-by: paul
|
| |\ \
| | |/ |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/gui/kernel/qevent.cpp
src/gui/kernel/qgesture.cpp
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Pierre
|
| |_|/
|/| |
| | |
| | | |
Reviewed-by: Trond
|
|\ \ \
| |/ / |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| |\ \ |
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Problem was caused by S60 closing a handle under our feet when QApplication
is destroyed. To avoid this, we open our own handle for the global lock
instead of using the shared one inside CFbsBitmap.
Also the global unlock/relock is not needed on S60 3.2 so this can be
eliminated and save a few cycles (the function call was a no-op before)
Reviewed-by: Jani Hautakangas
|
| | |
| | |
| | |
| | | |
Reviewed-By: Trond
|
|/ /
| |
| |
| | |
Reviewed-by: Trond
|
|\ \ |
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The QGtk class has been refactored into a private d class for QGtkStyle.
This allows us to re-use a lot of code for the Maemo5 style without changing
a single line in QGtkStyle itself plus we can easily add virtual functions
where the two styles need to behave different.
There shouldn't be any new functionality added (or old functionality lost) by
this commit.
Reviewed-By: jbache
Reviewed-By: Ralf Engels
|
|\ \ |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trond
|
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| |\ \ |
|
| | |\ \ |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On every beginDataAccess on the pixmap data, we checked the value of
the pointer to the bits and only updated the image if the pointer had
changed. However, we didn't take into account that the pointer could
be the same, even though the dimensions were different, since
malloc() could return the same memory area. This would lead to
painting into an image that had the wrong dimensions, which again led
to either crashes or image shearing. Fixed by checking the dimensions
before deciding to update the image.
Task: QTBUG-4815
RevBy: Jason Barron
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
EColor16M is in BGR format so after conversion to QImage RGB
values needs to be swapped.
Reviewed-by: jbarron
|
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
However, compiling with QT_NO_ICON will still not work :(
Reviewed-by: tom
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
Added AnimationHint, which didn't make too much sense in a generic enum,
so Qt::RenderHint was moved back into QGraphicsBlurEffect as
QGraphicsBlurEffect::BlurHint.
Reviewed-by: Gunnar Sletta
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trond
|
| |/
|/|
| |
| |
| |
| |
| | |
Better than having to befriend QPixmapData and setting is_cached
manually.
Reviewed-by: Tom Cooksey
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Use ExpandToTransparentBorderPadMode since we can use GL_CLAMP_TO_EDGE
to clamp to the texture.
* Shrink the bounding rects reported by the blur
and drop shadow filters (expanding by 2 * radius isn't needed).
* Use a single-pass blur for radii <= 3 to avoid the overhead of
rendering to an FBO.
* Made the fast blur setting generate filters for only a predefined set
of radii, and then use the actual blur radius to spread the sample
points outwards.
* Optimized the generated program to rely less on temporary variables,
as those seemed to not be handled very well by certain GLSL compilers.
Reviewed-by: Gunnar Sletta
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Modern graphics drivers tend to disable shared memory pixmaps,
since rendering operations often can't be accelerated by the
GPU when the pixmap data is pinned in system RAM.
Use XShmPutImage() to flush the window surface when this is case,
instead of falling back to the slower XPutImage() method.
Merge-request: 1684
Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Task-number: 262636
Reviewed-by: gunnar
|
|/
|
|
|
|
|
| |
There's no reason to lock ourselves to int in the API when some of the
backend could handle floating point blur radii.
Reviewed-by: Bjørn Erik Nilsen
|
| |
|
|\ |
|
| | |
|
|\ \
| |/
|/|
| |
| | |
Conflicts:
src/gui/painting/qtextureglyphcache.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Gives better performance in the raster paint engine.
For Symbian 9.3 onwards, this can also be used as the native pixmap
format. For 9.2, conversion is required.
Reviewed-by: Sami Merila
Reviewed-by: Jani Hautakangas
|
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| | |
Reviewed-By: TrustMe
|
| |
| |
| |
| |
| | |
Enable it by setting QT_USE_X11GL_PIXMAPS environment variable while
using the -graphicssystem opengl
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Before the QExplicitlySharedDataPointer change, the ref-count was 0 when
calling the cleanup hooks from ~QPixmap. That enabled the hook to figure
out if the pixmap is being modified or deleted. As the ref count is now
1 when calling the cleanup hooks in ~QPixmap, we need to seperate the
hooks.
This change should make using textre-from-pixmap faster as the EGL/glX
surface wont get re-created everytime the pixmap is modified.
Reviewed-By: Gunnar
|
|/
|
|
|
|
|
|
|
|
| |
If the pixmap is sharing data with other pixmaps, it must be detached
before it is filled. Instead of detaching by making a copy, create a
new uninitialized data object since all pixels are overwritten by
fill() anyway.
Task-number: QTBUG-3228
Reviewed-by: Trond
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
determined.
This restores the behavior from before the the gui plugin merge.
Reviewed-by: Olivier Goffart
|
| |
| |
| |
| |
| |
| | |
Make sure that we at least try to load an icon via the "hicolor" theme.
Reviewed-by: Olivier Goffart
|