summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit '4feb4019cfc144cef4cd9177d52e52dee9ebdf32' into 4.6Rohan McGovern2009-09-091-7/+7
|\ | | | | | | | | | | Conflicts: tests/auto/network-settings.h tests/auto/qpainter/tst_qpainter.cpp
| * Fixed bug in drawImage() when fall-back code path is used.Samuel Rødal2009-09-081-7/+7
| | | | | | | | | | | | | | | | 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
* | Make QGLWindowSurface use new QGLPaintDevice APITom Cooksey2009-09-081-0/+1
| |
* | Fix crash when instantiating multiple QApplications on QWSPaul Olav Tvete2009-09-081-0/+7
| | | | | | | | | | | | Copy variable initialization/cleanup code from X11 Reviewed-by: Tom
* | Take right bearing of glyphs into account when doing text layoutEskil Abrahamsen Blomfeldt2009-09-081-54/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fixed usage of QMargins in QStyleSheetStyleThorbjørn Lindeijer2009-09-081-4/+4
| | | | | | | | | | | | | | The order of the parameters to the QMargins constructor changed in commit 758f4735bcae034ac25730e53bb371df3b7d6e8a. Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* | Fixed QLineEdit to correctly adjust the horizontal scrollingAdriano Rezende2009-09-082-1/+7
| | | | | | | | | | | | | | | | | | 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
* | Fixes a regression in QListView in 4.6 regarding the selectionThierry Bastian2009-09-081-0/+4
| | | | | | | | | | | | | | 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
* | doc: Fixed several qdoc errors.Martin Smith2009-09-082-0/+7
| | | | | | | | That's the last of them... for now.
* | Merge commit 'origin/4.5' into 4.6Joerg Bornemann2009-09-081-2/+12
|\ \ | |/ | | | | | | Conflicts: src/gui/kernel/qapplication.cpp
| * Doc: keypad navigation is supported on Windows CEJoerg Bornemann2009-09-081-2/+10
| | | | | | | | Reviewed-by: thartman
* | Fixed the spelling of canceled in the QGesture api brought up by David Boddie.Denis Dzyubenko2009-09-072-6/+6
| | | | | | | | Reviewed-by: trustme
* | Use icons on QDialogButtonBox in KDEJens Bache-Wiig2009-09-074-15/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix crash on QGraphicsItem destruction related to focus handlingKai Koehne2009-09-071-1/+1
| | | | | | | | | | | | | | | | 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
* | Fix some issues with Shift-selection in QAbstractItemViewFrank Reininghaus2009-09-071-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Support setting font size in shorthand font propertiesEskil Abrahamsen Blomfeldt2009-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix tiled blit in 16-bit modePaul Olav Tvete2009-09-071-4/+7
| | | | | | | | | | | | | | | | 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
* | Make QGraphicsShaderEffect private API for 4.6Rhys Weatherley2009-09-061-1/+0
| | | | | | | | | | | | | | The custom shader code in the OpenGL2 paint engine needs time to mature before we make this official public API. Reviewed-by: trustme
* | Merge branch '4.5' into 4.6Rohan McGovern2009-09-051-2/+2
|\ \ | |/ | | | | | | Conflicts: src/gui/itemviews/qlistview.cpp
| * Fix pixel snow on the combo box popup on Snow Leopard.Morten Sorvig2009-09-041-0/+1
| | | | | | | | | | | | | | | | | | 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.
| * Wizard background images incorrect in Snow Leopard.Prasanth Ullattil2009-09-041-0/+1
| | | | | | | | | | | | | | We need to clear the QPixmap before the image is drawn using the CGContextDrawImage(). Reviewed-by: Norwegian Rock Cat
| * Fix a regression with QListView::setRowHidden() when a root index is setAndy Shaw2009-09-041-4/+4
| | | | | | | | | | | | | | | | | | 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
* | Fixed compile for S60.Rohan McGovern2009-09-051-1/+1
| | | | | | | | Q_DECLARE_METATYPE must appear before qRegisterMetaType.
* | Only export internal raster classes in QWSAnders Bakken2009-09-042-3/+15
| | | | | | | | | | | | | | | | 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>
* | Doc: Clarified that certain KDE widgets are KDE 3 widgets.David Boddie2009-09-041-4/+4
| | | | | | | | | | Task-number: 258991 Reviewed-by: Trust Me
* | Added multiple frames to QPaintBuffer.Samuel Rødal2009-09-042-7/+27
| | | | | | | | | | | | | | | | | | 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
* | Avoided streaming multiple copies of images/pixmaps in QPaintBuffer.Samuel Rødal2009-09-041-1/+74
| | | | | | | | | | | | This reduces the size of the trace files significantly in certain cases. Reviewed-by: Trond
* | Optimize qt_format_text test operations: try not to detachOlivier Goffart2009-09-041-40/+28
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix crashes when moving descendents during destruction.Andreas Aardal Hanssen2009-09-041-7/+11
| | | | | | | | | | | | | | | | | | | | | | 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
* | Don't call pure virtuals on deleting QGraphicsItemAaron Kennedy2009-09-041-1/+3
| | | | | | | | | | | | This also needs to be reviewed by andreas. Reviewed-by: Michael Brasser
* | Make sure that top-level windows respect hfw/wfh constraint.Jan-Arve Sæther2009-09-042-25/+151
| | | | | | | | | | | | | | | | | | | | Note that the constraint is only enforced when resizing the window interactively. Calling setGeometry() will not try to enforce the constraint. See the graphicsview/flowlayout example for a "manual test". Task-number: 257455
* | QGraphicsWidget::sizeHint didn't pass the correct constraint to layout.Jan-Arve Sæther2009-09-041-2/+4
| | | | | | | | | | Adjust the constraint with the widget margin before passing it on to d->layout->effectiveSizeHint().
* | Remove implicit margin on bulleted lists when exporting to HTMLEskil Abrahamsen Blomfeldt2009-09-041-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When we export a bulleted list to HTML, we add a meta-block around the list items to set the bullet style of the list (<ul> or <ol>.) This block will implicitly have a margin, even if the list itself does not in the internal document. The result is that exporting a list to HTML and then reloading it will give a different apperance, because the 0 margin of the original was not saved. The fix is to always set the meta-block's margin to 0, since it is only there to set the bullet style and should not affect the layout at all. Task-number: 201228 Reviewed-by: Simon Hausmann
* | Fix pixel snow on the combo box popup on Snow Leopard.Morten Sorvig2009-09-041-0/+1
| | | | | | | | | | | | | | | | | | 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.
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-09-0441-504/+1307
|\ \
| * | Stylesheet: Do not crop the text in tabsOlivier Goffart2009-09-042-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we did not reiimplement SE_TabBarTabText to force the parentstyle to call the virtual function back, we got the normal style margins in addition to the one by the stylesheet. Also added test for !hasNativeBorder to suport cases where we just specify a border Reviewed-by: jbache Task-number: 196326
| * | Fix ./tst_qdatetimeedit::task118867Olivier Goffart2009-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the QLineEdit change, the QLineEdit::displayText used to return the currently entered text when we call validate() on the validator. Now, the displayText is set _after_ the validation. Hence, the QDateTimeEdit::validate did not had access to the real text. Reviewed-by: Thierry
| * | Doc: Review of docs for QGraphicsItem::ItemUsesExtendedStyleOption.Geir Vattekar2009-09-041-7/+11
| | | | | | | | | | | | | | | Task-number: 253733 Reviewed-by: Bjørn Erik Nilsen
| * | fix text eliding for arabic and syriacLars Knoll2009-09-041-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arabic and Syriac are connected scripts where the letter shape changes depending on the context. Text eliding should not affect that letter shape if the truncation happens in the middle of a word. The patch ensures that by adding a Unicode ZWJ character between the text and the eliding in case the character would connect in the full string. Reviewed-by: Simon Hausmann
| * | Small corrections in the documentationBradley T. Hughes2009-09-041-2/+2
| | | | | | | | | | | | | | | 1. "is is" -> "it is" 2. remove excess use of the work "unexpected"
| * | qapplication_win.cpp compile fix for Q_WS_WINCE_WMJoerg Bornemann2009-09-041-1/+0
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-042-2/+7
| |\ \ | | |/
| | * Fixed clipping of native style elements when raster is used on macGunnar Sletta2009-09-041-2/+6
| | | | | | | | | | | | Reviewed-by: Trond
| | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jason McDonald2009-09-041-0/+6
| | |\
| | * | Pedantic fixes for license headers.Jason McDonald2009-09-041-0/+1
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-09-048-460/+415
| |\ \ \
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Rhys Weatherley2009-09-042-2/+2
| | |\ \ \
| | * | | | Modify QMatrix4x4 and QQuaternion to use qreal internallyRhys Weatherley2009-09-048-460/+415
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some concerns were expressed about the float precision of QMatrix4x4, which this change addresses by using qreal instead. The QVector2D/3D/4D classes still use float internally, so that they can be used directly in large arrays of vertex values to be uploaded to an OpenGL server. QQuaternion is a client-side class, and it should produce rotations that are consistent with QMatrix4x4. So its precision was changed too. A consequence of this change is that the following no longer works in a portable fashion: QMatrix4x4 mat; ... glLoadMatrixf(mat.constData()); The caller must now repack the argument to convert from qreal to GLfloat. Reviewed-by: Michael Goddard Reviewed-by: Andreas
| * | | | | Update license headersJason McDonald2009-09-041-0/+1
| | |/ / / | |/| | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Fix compilation on OS X.Michael Brasser2009-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy