| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
| |
Partially revert 6715f2f29ae413b328243d8c3dbe15cfba51d33f
struct QWSServerCleaner { ~QWSServerCleaner(); } is not a function.
Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
When loading binary files as text, QTextCursor did not check for
beginning and end of frame (QChar(0xfdd0) and QChar(0xfdd1)), while
QTextDocument asserted that those characters were absent.
The patch makes QTextCursor::insertText() treat frame bounderies like
paragraph separators.
Reviewed-by: ck
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QFontMetrics::boundingRect() that takes a string needs to account for
the right bearing of the last glyph, as it is documented to be the
rectangle that contains the pixels of the text. I've added a test for
this, and fixed tst_QFontMetrics::elidedText() to use boundingRect() to
find the actual width of the text drawn (width() will return the advance
of the text, which is larger than the actual width of the pixels.)
I've also fixed a small typo in the "len" -> "ilen".
Reviewed-by: Simon Hausmann
|
|
|
|
|
|
|
|
| |
Removes dangling subFocusItem pointers when changing focus after
reparenting. This change also includes a mini-optimization when adding
focusable items to an inactive scene.
Reviewed-by: brad
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change ensures that only active scenes can have active input
focus items. If you try to set input focus on items that are in an
inactive scene, these items will gain input focus only when the scene
is activated.
For scenes attached to a view, this change should only fix the bug that
you could have a blinking line edit in a scene when the view is inactive,
meaning you couldn't type into the line edit.
For scenes that have no view, you now must activate the scene in order
to give the items active input focus. This will affect those who use
QGraphicsScene with custom key and focus handling.
Reviewed-by: brad
|
|
|
|
|
|
|
|
|
|
|
|
| |
This change partially reverts f68fed388dcdba6ab6dad3af4933bcd3aa123cf8,
which was an attempt at getting FocusRealms working. Turns out this
approach is wrong. The flag behaves badly when reparenting, and the
feature conflicts with plain old setting focus.
Discussed with Aaron; this change was already reverted in the
kinetic-declarativeui branch.
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
|
| |
Previously, QtOpenGL assumed that by linking against QtGui, it would
automatically also be linked against EGL. However, this is no longer the
case after 83940f25dba51a9942ab55ed8475fc7fc8a8da84 which makes sure
only QtGui links against EGL and not other libs/apps linking against
QtGui.
Reviewed-by: Rhys Weatherley
|
|
|
|
| |
Reviewed-by: TrustMe
|
|
|
|
|
|
|
|
|
| |
This is due to the fact that it receives a mousemoveevent.
But as it doesn't receive a mousepress event, we can detect whether it
should popup or not.
Task-number: 260873
Reviewed-by: prasanth
|
|
|
|
|
|
|
|
| |
It can happen that an item is still a gap and could then be deleted
twice. We now check that to avoid double deletion.
Note: it doesn't fix the bug but avoids the crash.
Task-number: 260873
|
|
|
|
| |
The resource compiler still generates files that don't have the LPGL header.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There is one actual bug fix, checking for null pointer return.
The exception safety test code now initialises the fonts system.
The S60 fonts system does not survive OOM testing
without this.
Otherwise some duplicate tests are removed and code tidied up.
Reviewed-by: Liang Qi
Reviewed-by: Harald Fernengel
Reviewed-by: Alessandro Portale
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reset the dangling subFocusItem pointer in ~QGraphicsItem,
after all the child items have been deleted.
This replaces commit d724c91a0ae.
Reviewed-by: Thomas Hartmann
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
tests/auto/network-settings.h
tests/auto/qpainter/tst_qpainter.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We need to floor instead of round to prevent rectangles that are on the
edge from being shifted one pixel down / right.
Task-number: 258776
Reviewed-by: Kim
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Copy variable initialization/cleanup code from X11
Reviewed-by: Tom
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
To support correctly breaking text and calculating the bounding rect
of text that has a right bearing (like italic text), we need to take
the bearing into account when doing the layout. We add the bearing when
checking whether we need to break the text, and we add it to the natural
width of the text whenever we've finished a text line, so that we get
the correct bounding rectangle.
This patch only takes the last glyph's bearing into account. The
theoretically correct approach would be to take all bearings into account
and use the one which gives the longest text width. However, in practice
the bearing of the glyph will not be great enough for it to span over
several other glyphs.
Also refactored a little to make the code simpler.
Task-number: 176401
Reviewed-by: Simon Hausmann
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The order of the parameters to the QMargins constructor changed in
commit 758f4735bcae034ac25730e53bb371df3b7d6e8a.
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The widget needs to use the naturalTextWidth to adjust the horizontal
scrolling, otherwise it will not fit correctly the text in the visible
area when resized.
Merge-request: 1410
Reviewed-by: Alan Alpert
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
In icon mode, if you click on the viewport (with extended selection),
the selection should be cleared when you release the mouse button.
Reviewed-by: ogoffart
|
| | |
| | |
| | |
| | | |
That's the last of them... for now.
|
| | |
| | |
| | |
| | | |
Task-number: 241223
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 241223
Reviewed-by: Janne Koskinen
|
| | |
| | |
| | |
| | |
| | | |
Task-number: 241223
Reviewed-by: Janne Koskinen
|
|/ /
| |
| |
| |
| | |
Task-number: 241223
Reviewed-by: TrustMe
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/kernel/qapplication.cpp
|
| |
| |
| |
| | |
Reviewed-by: thartman
|
| |
| |
| |
| | |
Reviewed-by: trustme
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Oxygen did not use icons in dialogs. This is obviously
incorrect compared with other KDE apps. We changed common style
to enable button icons by default on X11 and explicitly
disabled them for Windows and Motif styles.
We also updated the icons for YES and NO actions to use
dialog-ok and process-stop to reflect the usaged in
KDE itself.
Reviewed-by: ogoffart
|
| |
| |
| |
| |
| |
| |
| |
| | |
Do not call clearFocus() for child item in setParentItemHelper() if
called from destructor: At this time, the ~QGraphicsItem destructor
already deleted all its children.
Reviewed-by: Andreas Aardal Hanssen
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This commit fixes some issues which occur when pressing the Shift key
while selecting items (new unit tests included):
1. The offset of the visible area is missing at one point in
QAbstractItemView::keyPressEvent, causing Shift-Arrow selection to fail
if the view is scrolled down.
2. Shift-click and Shift-Arrow selection fail after a rubberband
selection because d->pressedPosition does not correspond to a valid
QModelIndex.
The problems have been found in Dolphin:
http://bugs.kde.org/show_bug.cgi?id=163451
Merge-request: 1426
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The fontSizeAdjustment defaulted to 0 which means "medium" in internal
semantics. This will override any font size you set in the short-hand.
In other locations, fontSizeAdjustment defaults to -255 which has no
meaning attached. To allow setting the font size in short-hand (as in
"font: 20px Arial"), we can't default to a specific adjustment.
Two tests are added: The first verifies the case that already worked,
where you specify the font size using the "font-size" property. The
other verifies the short-hand case and would previously fail.
Task-number: 207189
Reviewed-by: Simon Hausmann
|
| |
| |
| |
| |
| |
| |
| |
| | |
Optimizations in change 8e447e8a did not handle the case when the target
width is less than the width of a tile.
Task-number: 260759
Reviewed-by: Samuel
|
| |
| |
| |
| |
| |
| |
| | |
The custom shader code in the OpenGL2 paint engine needs time to
mature before we make this official public API.
Reviewed-by: trustme
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/gui/itemviews/qlistview.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
On 10.5 and below the pixmap data bytes happened to be initialized by
malloc, on 10.6 this is no longer the case.
Revby: Gunnar Sletta <gunnar@trolltech.com>
Similar to 28f94e1ef94f.
|
| |
| |
| |
| |
| |
| |
| | |
We need to clear the QPixmap before the image is drawn using the
CGContextDrawImage().
Reviewed-by: Norwegian Rock Cat
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When setRowHidden() was called after a root index was set then it would
not actually hide the row, if a root index is not set then it worked
fine.
Task-number: 260879
Reviewed-by: Jan-Arve
|
| |
| |
| |
| | |
Q_DECLARE_METATYPE must appear before qRegisterMetaType.
|
| |
| |
| |
| |
| |
| |
| |
| | |
QRasterizer, QClipData and QRasterBuffer only need to exported when
QRasterPaintEnginePrivate is subclassed which only is the case for
DirectFB.
Reviewed-by: Noam Rosenthal <noam.rosenthal@nokia.com>
|
| |
| |
| |
| |
| | |
Task-number: 258991
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This lets us stream a single QPaintBuffer instead of one QPaintBuffer
per frame in the trace graphicssystem, which leads to not streaming
pixmaps / images once per frame. Performance when doing a trace is also
a lot better for painting heavy applications.
Reviewed-by: Trond
|
| |
| |
| |
| |
| |
| | |
This reduces the size of the trace files significantly in certain cases.
Reviewed-by: Trond
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Second try.
This is a fixed version of the one reverted in commit 25014061b8de
The difference is that it does
text[offset] = QChar::LineSeparator;
instead of
chr = QChar::LineSeparator;
Reviewed-by: Eskil
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This fix prevents crashes in
QGraphicsItem caused by calls to pure virtual functions as an item
tries to access its dying parent. This happens when an item is moved
by an ancestor during this ancestor's destructor.
Autotests included.
Reviewed-by: bnilsen
|
| |
| |
| |
| |
| |
| | |
This also needs to be reviewed by andreas.
Reviewed-by: Michael Brasser
|