summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Fixed wrong scrolling in QListView with hidden rows in ListModeGabriel de Dietrich2009-10-202-7/+18
| | | | | | | | | | | The flow positions in ScrollPerItem mode did not take the hidden rows into account when configuring the vertical scroll bar. A mapping between the scroll bar value and the flow position has been added. Auto-test included. Task-number: QTBUG-2233 Reviewed-by: Thierry
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-2058-338/+918
|\
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Alexis Menard2009-10-209-412/+533
| |\
| * | Cocoa: modal window reappears on screen after reactivating appRichard Moe Gustavsen2009-10-201-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | If you close a modal window, then activate different app, then activate app again, the window will pop non-modal in front. This patch makes sure that when we hide a window, we point to the next window to receive keyboard focus. Rev-By: MortenS
| * | Fix bug QTBUG-4848Sarah Smith2009-10-202-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | Make the shapeText function return numGlyphs properly - its not always the same as length of string. Task-number: QTBUG-4848 Reviewed-by: Rhys Weatherley
| * | fix widget activation from minimized state on Windows mobileJoerg Bornemann2009-10-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following didn't work on Windows mobile: * show a widget normal (non-maximized) * minimize it * reactivate it via the file explorer * now the widget should be visible again The code path from minimized to normal state was missing. Reviewed-by: thartman
| * | qwidget_wince.cpp: don't invalidate the crect on maximizeJoerg Bornemann2009-10-191-14/+4
| | | | | | | | | | | | | | | | | | | | | If we do this, QWidget::width() returns negative sizes, which makes QGraphicsView crash. Reviewed-by: thartman
| * | qwindowsmobilestyle.cpp: endif comment fixedJoerg Bornemann2009-10-191-1/+1
| | |
| * | Fix doc error.Jason Barron2009-10-191-1/+1
| | | | | | | | | | | | | | | | | | Should *not* be used as a softkey. Reviewed-by: TrustMe
| * | Fixed QWidget::raise in SymbianMiikka Heikkinen2009-10-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | If toplevel window is raised, the whole application is now raised to foreground. Task-number: QT-2162 Reviewed-by: axis
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-1952-293/+826
| |\ \
| | * | 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>
| | * | Made Mac Carbon use the input method hints when deciding on IM.axis2009-10-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New behavior is to turn them off when inputting numbers or hidden text, which is the way it was in Qt 4.5. Task: QT-1938 Task: QT-2257 RevBy: Prasanth Ullattil
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-1982-1630/+3317
| | |\ \
| | | * | Doc: Documentation for gesture features. Still a moving target.David Boddie2009-10-164-4/+283
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Doc: Gesture API documentation review and improvements.David Boddie2009-10-162-12/+37
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-10-161-1/+1
| | | |\ \
| | | | * | doc: Corrected typo.Martin Smith2009-10-161-1/+1
| | | | | |
| | | * | | Softkeys remain disabled if action owning action widget is enabledSami Merilä2009-10-165-13/+13
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys have a QAction that is related to some action widget. The initial state of the action was set according the state of action widget (enabled/disabled). Now, if action widget's state changes, the softkey's action remain in the initial state. This was fixed by removing the enable/disable from the QAction and instead use the real state of action widget when handling the command of softkey. Task-number: QTBUG-4619 Reviewed-by: Janne Anttila
| | | * | doc: Fixed the wording in some \brief commands.Martin Smith2009-10-162-2/+2
| | | | |
| | | * | Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-1611-77/+128
| | | |\ \
| | | | * | Recognize transformed screens when looking for a QGLScreenRhys Weatherley2009-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QWS_DISPLAY is specified as "Transformed:powervr:...", then we will encounter QScreen::TransformedClass rather than QScreen::ProxyClass when searching for the QGLScreen. This change makes the code search for both. Task-number: QT-2261 Reviewed-by: Sarah Smith
| | | | * | 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
| | | | * | Make QT_DIRECTFB_SUBSURFACE an opt-in optionAnders Bakken2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously you had to define QT_NO_DIRECTFB_SUBSURFACE to prevent Qt from using subsurfaces for locked surfaces. Now make the default be QT_NO_DIRECTFB_SUBSURFACE and rather allow people to define QT_DIRECTFB_SUBSURFACE to use this option. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | * | 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
| | | | * | Merge commit 'origin/4.5' into origin/4.6Olivier Goffart2009-10-153-14/+14
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/network/access/qhttpnetworkconnection.cpp src/opengl/qgl_qws.cpp src/opengl/qglpixelbuffer_egl.cpp
| | | | | * | Some sub menus are disabled in CocoaPrasanth Ullattil2009-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commit faec535829a0e454a6784b0c5c37cb63e7da8f73 introduced this bug. Since we can add a submenu to the same supermenu, we should consider it before disabling the submenu who already have a supermenu. Reviewed-by: MortenS
| | | | | * | Fix regression while updating items in itemview.Olivier Goffart2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | geometry() is in parent coordinate. We want the coordinate in viewport coordinate. There is an offset (the header geometry) between the two. So the first item was not refreshed. (Regression because of e5b32fbe0efc8 and a54c18e27bbb) Reviewed-by: Gabriel Reviewed-by: Alexis Task-number: QTBUG-4849
| | | | | * | Fix a crash in cocoa when a QMessageBox is destroyed from dropEvent()Prasanth Ullattil2009-10-121-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The gobal variable which stores the current mouse event can be updated before dragImage() call(blocking) is finished. So make a local copy of the information required by the QDragManager::drag(). Task-number: QTBUG-4814 Reviewed-by: MortenS
| | | | * | | Merge commit 'a814aba657288942b5beed70a2110446420f981c' into origin-4.6Olivier Goffart2009-10-154-2/+7
| | | | |\ \ \
| | | | * | | | Made Mac Cocoa use the input method hints when deciding on IM.axis2009-10-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New behavior is to turn them off when inputting numbers or hidden text, which is the way it was in Qt 4.5. Task: QT-1938 Task: QT-2257 RevBy: Prasanth Ullattil
| | | | * | | | Fix pointer grab issues in S60Shane Kearns2009-10-151-56/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Did the long awaited "refactor me" in QSymbianControl::HandlePointerEvent Pointer is grabbed by MousePress, and released by MouseRelease - unless already globally grabbed. Pointer events are routed to the widget that grabbed the mouse. Task-number: QTBUG-4695 Task-number: QTBUG-4674 Reviewed-by: axis
| | | | * | | | fix compilation with namespaceshjk2009-10-151-2/+6
| | | | | | | |
| | | * | | | | Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-1596-1732/+3030
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qcoreevent.h
| | | | * | | | Compile on Carbon.Morten Johan Sørvig2009-10-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ifdef out QCocoaPrintPanelDelegate.
| | | | * | | | Signal for an update when the cursor is visibleAlan Alpert2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug against QFxTextInput is actually due to a bug in QLineControl. Task-number: QT-2319 Reviewed-by: Martin Jones
| | | | * | | | qt_paint_device_metric() for fetching metricsRhys Weatherley2009-10-154-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Custom window surfaces, graphics systems, and Qt/Embedded screen drivers often need to access QPaintDevice::metric(), but it is protected. Hence the growing number of friends in QWidget and QImage. The qt_paint_device_metric() function provides a more future-proof approach that doesn't require lots of friends. Reviewed-by: Gunnar
| | | * | | | | When reparenting native widget, delayed deletion of Symbian controlGareth Stockwell2009-10-155-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | until control returns to the event loop. This is necessary because reparenting can be triggered from the context of a control's event handler. If reparenting causes that control to be deleted, a crash can result. Task-number: QTBUG-4664 Reviewed-by: axis
| | | * | | | | Modified QSymbianControl::setFocusSafely to set last focused controlGareth Stockwell2009-10-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to zero only if currently focused Reviewed-by: axis
| | | * | | | | Added a new event type, WinIdChange.Gareth Stockwell2009-10-091-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is sent to a native widget when its window system identifer has changed. This is motivated by the fact that, on Symbian, the native window system identifier may change in situations other than a change of parent widget. Specifically, calling QWidget::setParent, passing in the widget's existing parent, but OR-in Qt::Window into the window flags, causes a new native window handle to be created. Furthermore, because of the fact that Symbian does not allow existing windows to be reparented, any descendents of the original widget which are also native, must also be given new window system handles. Note that setWinId does not send a WinIdChange event if the incoming winId is zero. This is because setWinId(0) is only called in two situations: 1. During native widget destruction 2. During re-creation of the winId for a native widget Task-number: QTBUG-4664 Reviewed-by: Bjoern Erik Nilsen
| | | * | | | | Modified reparenting to correctly deal with native child widgetsGareth Stockwell2009-10-092-23/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both reparenting and modification of window flags are done by calling QWidget::setParent. If either the parent changes, or a non-top-level widget becomes top-level (as a result of OR-ing Qt::Window into its window flags), a new native window ID is created for the widget. The Symbian implementation of setParent_sys had a flaw which manifested itself in the following situation: 1. We start with a native widget X, and its child Y, which is also native. There exist parent-child relationships between the associated CCoeControl instances, and the native windows (represented by RWindow handles). 2. X gets a new native window created as a result of a call to setParent. 3. QWidgetPrivate::reparentChildren calls SetParent on Y's control, to re-establish the parent-child relationship. The problem is that the window owned by Y's control now has no parent, so if we try to re-size the widget, the window server panics the client thread (WSERV-52). Because Symbian does not allow existing windows to be re-parented, and nor does it allow a window-owning control to re-create a new window, the only way to provide Y's window with a parent is to destroy the control and create a new one, passing in X's new window to the CCoeControl::CreateWindowL function. The changes made are as follows: a) QWidgetPrivate::reparentChildren is therefore modified to call create_sys, with destroyOldWindow set to true. b) QWidgetPrivate::create_sys is modified to take account of the value of this flag in all cases. (Previously it only did so if a new WId was passed in by the caller). c) The call to setWinId is delayed until the control and window are fully initialized. This is to allow us to emit a new event, WinIdChanged, from setWinId, in order to inform the widget that its winId has changed. d) QWidgetPrivate::activateSymbianWindow is modified in order to support this change of call ordering. Note that QWidgetPrivate::create_sys requires some re-factoring in order to remove the redundancy between the top-level and child widget cases. Task-number: QTBUG-4664 Reviewed-by: axis
| | * | | | | | This reverts commit 99739f35bf700a2bff707da99f5043cd7c12aed5.Kim Motoyoshi Kalland2009-10-161-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create native windows when setting the window title, delay the creation until the native window is needed. If a user really needs the window to be created, he/she can call winId() on the widget or set Qt::AA_ImmediateWidgetCreation. Reviewed-by: Bradley T. Hughes
| | * | | | | | Fixed a crash in tst_qpainter on SPARC w/gcc.Trond Kjernåsen2009-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test works with the native Sun compiler for some reason, and the problem is an unaligned read of 16 bits, which is a problem on several other architectures. Reviewed-by: Kim
| | * | | | | | Fixed QPainter::begin() so that it fails gracefully.Kim Motoyoshi Kalland2009-10-152-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | Added explicit qualification of static functions to fix xlC compilation.Samuel Rødal2009-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems static inline functions need to be fully qualified when called from inside a template function. Task-number: QTBUG-3368 Reviewed-by: Gunnar Sletta
| | * | | | | | Optimized raster drop shadow filter to only blur alpha channel.Samuel Rødal2009-10-151-24/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gunnar
| | * | | | | | CompileEskil Abrahamsen Blomfeldt2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no implicit conversion from QPixmap to QImage Reviewed-by: Gunnar
| | * | | | | | Optimized bloom graphics effect implementation.Samuel Rødal2009-10-141-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid doing so many conversions by operating on raster pixmaps, and by using INV_PREMUL/PREMUL instead of converting to ARGB32. Reviewed-by: Gunnar Sletta
| | * | | | | | 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