| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
src/gui/kernel/qcocoaview_mac_p.h
src/gui/widgets/qmainwindow.cpp
|
| |
| |
| |
| |
| | |
Task: 252796
Rev-By: Tor Arne
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The crash only occurred on Windows and X11 when running with
-graphicssystem raster. The reason is that the actual paint device
in QRasterPaintEngine::begin() is changed to pixmap->data->buffer(),
which means QPaintEngine::paintDevice() returns something else than
what it was told to paint on (see cb0c899b56b84154f69ddc545991bc6ded96ab01)
The root of the problem, however, was that we used a weird condition
(painter->worldMatrixEnabled(), added in 345072b9 for Qt 4.4) to find
the target device. We did that because the shared painter was completely
different in 4.4. We refactored it in 4.5.0, and we can only trust
QPaintEngine::paintDevice to be the target device.
Auto-test included.
Task-number: 252837
Reviewed-by: Trond
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem was that we discarded update requests for fully
transparent items, which is correct, but we even did that
when the update was issued from QGraphicsItem::setOpacity.
We don't have to, and shouldn't, consider the opacity in
that case. Whenever we reach the fullUpdateHelper call in
setOpacity it means we have to do an update regardless of
the current opacity (oldOpacity was not 0.0 if the
currentOpacity is 0.0).
Auto-test included.
Task-number: 252913
Reviewed-by: Andreas
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In 4.4 alphaMapForGlyph() would return valid images for any font size,
but this was changed in 4.5, forcing us to use the path fallback
instead. This lead to non-antialiased fonts when not using a
multisample-enabled GL format. This patch re-introduces the
alphaMapForGlyph() fallback in QFontEngine from 4.4 which uses the
raster paint engine to draw the glyph.
Task-number: 247083
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fix ensures that the current tab is visible after calling
setTabButton() on a scrolled tab bar.
Reviewed-by: bnilsen
Task-number: 252472
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is still not a perfect solution since it breaks 245347 again
Task-number: 252319
Reviewed-by: Maurice
|
| |/
| |
| |
| | |
Task-number: 252287
|
| |\ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We were registering the types each time drag and drop was enabled, which
caused slowdowns when for example switching between the Edit and Debug
modes in QtCreator.
Instead, register the types on first enable and also when the custom types
change. Add check to draggingEntered() that disables the drag if
WA_DropSiteRegistered is false.
Reviewed-by: nrc
|
| |/
| |
| |
| | |
Task-number: 244858
|
| |
| |
| |
| |
| |
| | |
QTextCursor::operator=
Task-number: 247955
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The problem is that the mouse event was redirected to the active
pop-up, while it should have been redirected to the widget under
the mouse under the active popup. This patch does the correct
redirection
Task-number: 252259
Reviewed-by: Trenton Schulz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There was code for updating the size constrains inside
setConstraints_sys. This is now added. Factored out the code that
does this into a function, and since we never applied size constraines
on a window upon creation, I also added an extra call from that
code part
Task-number: 219695
Reviewed-by: Trenton Schulz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Due to a wrong lookup (confusing line and block number) the scroll
optimization was broken, causing the entire view to be updated.
Reviewed-by: Thorbjørn Lindeijer
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Don't use aliased coordinate delta for image drawing.
Related to change fde7475bcf9c10522a8170e6eb8fb9a8fadc21cd.
Task-number: 251561
Reviewed-by: Trond
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Forward setDesktopBackground to setBackground as is mentioned in the
docs.
Reviewed-by: Paul
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
selections with different foreground but no background
The main concern is to avoid double painting. With anti-aliasing turned
on by default, we can not draw a piece of text on top of the same piece
of text without artefacts.
Task-number: 252310
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the feature has to handle text with and without background, and extra
selections with and without background, or even only with underline style.
Trouble is that you sometimes want to accumulate styles, for example spell
checking wiggly underline plus search result highlights or background markup
from the css stylesheet.
Task-number: 252310
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Instead instigate the quit by calling QApplication::quit(), using the code
that was already in place. This allows QApplication::exec() to return normally
and prevents resrouce leaks for objects created on the stack in main().
Reviewed-by: nrc
|
| | |/
| |/|
| | |
| | | |
Task-number: 252415
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/
| |
| |
| |
| |
| |
| |
| | |
To avoid increasing code size for an uncommon case, the code
is #ifdef QT_QWS_ROTATE_BGR
Task-number: 250299
Reviewed-by: Tom
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The patch has some issues with text eliding which are not really
possible to solve properly without providing the elidemode
to the styleoption. Under these circumstances it seems better
just to fix the problem in Oxygen itself which has already been
patched when compiled with 4.5.
This reverts commit d7072b5577e3c07e984885cf05d5f9b217c6f473.
|
| |
| |
| |
| |
| | |
Task-number: 252292
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
embedded somewhere.
If a widget is embedded to non-Qt window on Windows, then we should still clear
the focus whenever we receive WM_KILLFOCUS since we won't get WM_ACTIVATEAPP in
this case. This is an addition to 6ed196051d0f19bfe2d045eaf12f5f5ca30670d0
Task-number: 251259
Reviewed-by: Thierry
|
| |
| |
| |
| |
| |
| |
| |
| | |
Got a case somehow with a timestamp of the mouse event that is less than
the timestamp we already had, so we need to make sure time only goes
forward.
Reviewed-by: Brad
|
| |
| |
| |
| |
| | |
Task: 252796
Rev-By: Tor Arne
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We are now moving focus to the XEmbed focus proxy when we accept a
client and when we get window activation. Window activation did that
before, but only when we were the active container, thus had focus in.
Now we do it always.
Due to race conditions with the window manager, the time stamt we used
for XSetInputFocus was the same as that of the window manager. This
broke it from time to time in Metacity and Xfce but always in KWin.
With other tested window manager we didn't have this issue.
Following Owen Tayler's advice (one of the authors of the XEmbed
specification) we now use CurrentTime and not qt_x11Data->time
when moving the input focus as there is no explicit user interaction
involved.
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem was that we were not always storing the modelindex in
column 0 for each QTreeViewItem. That was causing inconsistencies.
Now it is always the case. It allowed to remove some calls to
QModelIndex::sibling.
Task-number: 239271
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the label's sizeHint is bigger than its minimumSizeHint, the field
may be resized smaller than its minimum size.
This also fix another problem where the field would 'jump' from one
sizehint to the others.
(This can happen if labels can word-wrap for example)
Reviewed-by: Michael Goddard
|
| |
| |
| |
| |
| |
| | |
Spotted by looking at the code
Reviewed-by: bnilsen
|
| |
| |
| |
| |
| |
| |
| | |
This is only usefull when eliding text. We just make SE_TabBarTabText
match to what's computed by QTabBar::tabSizeHint
Reviewed-by: jbache
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is required for KHTML
Patch by David Faure
(the test is not really related)
Reviewed-by: Thierry
Task-number: 252912
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The method did not adhere to the documented behavior nor according to
its precedessor in Qt 3 times. Now, when being passed -1 as argument,
it will automatically assign ids. They will all be negative, starting
from -2.
Reviewed-by: mae <qt-info@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The problem was that mouse move events were not forwarded to the scene
when mouse tracking was explicitly enabled on the view.
Mouse tracking is disabled by default unless the scene contains
an item that accepts hover events or has a cursor set.
A mouse move event can only occur if:
1) a mouse button is pressed while moving the mouse
2) mouse tracking is enabled
That means the part I've reverted was only hitting when
mouse tracking was explicitly enabled, which is wrong.
We always have to forward mouse move events to the scene if
the view is getting them in the first place.
Auto test included.
Reviewed-by: Andreas
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When requesting image/ppm type we didn't return the proper pixmap
because type 'PIXMAP' is not a proper image format name, but a reserved
atom, so the fix is to remove redundant check that was triggered before
we entered the actual function that tries to convert the clipboard
content.
Task-number: 252501
Reviewed-by: Brad
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Mozilla encodes the text/html format in UTF16 and adds a BOM, however
it doesn't specify the charset in the html header. The fix is to guess
the encoding by either charset in the html header or BOM for text/html
format, or by BOM for non html formats.
This commit adds a new public function QTextCodec::codecForUtfText() which
can be used to guess encoding out of the BOM.
Task-number: 250555
Reviewed-by: Benjamin Poulain
Reviewed-by: Simon Hausmann
Reviewed-by: Andreas Aardal Hanssen
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
I'm tired of these "hidden" functions. We have an
AA_MacPluginApplication, but sometimes you may have a legitimate reason
for setting this outside of "plugin applications." In the footsteps of
the menu icon attribute, the attribute is the main leader, but menubars
can disable/enable this locally the new QMenuBar::setNativeMenuBar()
property. Otherwise, the menubars take their que from the application
attribute.
This also works for Windows CE. So, there is a bit on convergence as
well.
Task-number: 236757
|
| |\ \
| | |/
| | |
| | |
| | | |
Conflicts:
src/gui/itemviews/qabstractitemview.cpp
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 252668
Reviewed-by: Samuel
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In general, Cocoa handles the the Apple Events for us. However, this is
time between creating the NSApplication and Cocoa has set everything up,
usually after the event loop is running. This means that until that
time, the events are dropped on the floor :-/. The workaround is to use
the same handler that we use for Carbon, but to only have it enabled for
until Cocoa is ready to handle things. This will result in not stepping
on the toes when used in a plugin (if it does, we can conditionalize
it).
Task-number: 252795
Reviewed-by: Richard Moe Gustavsen
|