summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \
| * \ Merge commit origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-155-67/+92
| |\ \
| * \ \ Merge origin/4.6 into team-widgets/4.6Olivier Goffart2009-10-1425-85/+740
| |\ \ \
| * | | | Make the autotest pass for descending order in QTableWidgetPierre Rossi2009-10-142-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It failed after this commit: 19030e2af098e319e3c3f3883c51e28364bf3ccf Reviewed-by: ogoffart
| * | | | Sorting bug in QTableView fixPierre Rossi2009-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the DisplayRole is identical for two or more items, any modification of one item (e.g. backgroundColorRole) may trigger a re-ordering, which is obviously not an behaviour to be expected. Same fix as the one used for QTreewidget in c9eacfa1c791e2d228a3c8f0c119d02d7f46ee02. Task-number: QTBUG-4856 Task-number: 262056 Reviewed-by: Olivier Goffart
| * | | | Fix sorting after changing a QTableView's headerOlivier Goffart2009-10-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep the sorting states in sync with the header when setting custom headers Reviewed-by: Gabriel Task-number: QTBUG-3128 task-number: 234926
| * | | | Itemview: fix regression concerning Ctrl+rubber band selectionsFrank Reininghaus2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When making a rubber band selection while Control is pressed in an itemview with extended selection, make sure that the selection state of the items inside the rubber band is toggled. This ammend commit 0644e3dce532b1df00a77d3a30c61d6b75d3ff30 Merge-request: 1759 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Reviewed-by: Gabriel Task-number: QTBUG-1435 Task-number: 191545
* | | | | 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
| | | | |
* | | | | 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
* | | | | Removed assertion from QComboBox::removeItem()Stian Sandvik Thomassen2009-10-151-1/+4
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Made QComboBox::removeItem() do nothing instead of asserting if index is out of range. Reviewed-by: Andy Shaw
* | | | Cocoa: QInputDialog autotest reveals event dispatcher bugRichard Moe Gustavsen2009-10-141-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Cocoa, we sometimes need to block sending posted events (because we need to flush the event que now and then without touching Qt events). But we forgot to do same for timer callback. So this patch makes sure that we dont send the timer event immidiatly if we are just flushing the event que. Rev-By: brad
* | | | doc: Replaced \obsolete with \warning.Martin Smith2009-10-143-59/+76
| | | | | | | | | | | | | | | | | | | | | | | | Warning: This class is provided only to get access to S60 specific functionality in the application framework classes. It is not portable. We strongly recommend against using it in new applications.
* | | | Cocoa: qfiledialog will not exit cleanlyRichard Moe Gustavsen2009-10-141-0/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | The native filedialog will not exit if it is told to hide. To remedy this, we just add an extra interrupt call so to inform the event dispatcher that it needs to return the the event loop to check if it has been told to quit Rev-By: olivier
* | | Modified QSymbianControl::setFocusSafely to set last focused controlGareth Stockwell2009-10-131-1/+2
| | | | | | | | | | | | | | | | | | to zero only if currently focused Reviewed-by: axis
* | | Mac: fix autotest for qcolordialogRichard Moe Gustavsen2009-10-131-1/+3
| | | | | | | | | | | | Rev-By: olivier
* | | crash fix on WinCE without gesture supportMaurice Kalinowski2009-10-131-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | dd9d8693 added some checks causing SetGestureConfig to not be initialized to 0. Thus it gets derefenced and causes crashes on all WinCE applications. Reviewed-by: denis Reviewed-by: ninerider
* | | Mac: small bugfix to the mac gesture implementationRichard Moe Gustavsen2009-10-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Make sure that we cancel the pan gesture if the user starts to press several fingers on the trackpad, and the gesture has not yet got a chance to start Rev-By: trustme
* | | Fixed the QKeyEvent::nativeModifiers() call.axis2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | Earlier we returned a copy of the Qt modifiers. This patch fixes the call to return the real native Symbian one. RevBy: Sami Merila
* | | Mac: small code fix-up for the gesture commit 5 min ago.Richard Moe Gustavsen2009-10-131-2/+5
| | | | | | | | | | | | Rev-By: trust me
* | | Mac: implement gestures conforming to the new APIRichard Moe Gustavsen2009-10-136-17/+392
| | |
* | | Carbon: QApplication auto test shows bug in event dispatcherRichard Moe Gustavsen2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the bug is that we call _quit_ on the eventloop just _after_ posting the deffered delete event (from inside deleteLater function, ref the test where it fails, tst_qapplication.cpp:1242). And the point is, even if the loop level tells us that we _can_ delete the object in this case, the 'quit' tells us that we should not process _any_ events (until we get a call to processEvents again). So this patch makes sure that we don't call sendPostedEvents from the eventDispatcher if it is interruped. Rev-By: brad
* | | Second attempt: Fixed a few compiler warnings from QtGui for Symbian.Janne Anttila2009-10-134-4/+7
| | | | | | | | | | | | | | | | | | | | | The previous commit 9c6e466dc09813dd4a641b2cf385f35ac99346f5 included some changes which were not meant to be pushed. Reviewed-by: TrustMe
* | | Revert "Fixed a few compiler warnings from QtGui for Symbian."Janne Anttila2009-10-137-16/+11
| | | | | | | | | | | | | | | | | | Accidentally used git commit -a when should have used only git commit :( This reverts commit 9c6e466dc09813dd4a641b2cf385f35ac99346f5.
* | | Remove heuristic mask from S60 cursor to match other platformsShane Kearns2009-10-131-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | S60 port was supporting QCursor(QPixmap) where the pixmap didn't have any mask or alpha channel, and generating a mask using QPixmap::heuristicMask. Now changed to draw the cursor opaque in this case, which matches the behaviour on other platforms. Also it failed horribly with shaded backgrounds e.g. draggable icons demo Task-number: QTBUG-4761 Reviewed-by: axis
* | | Merge qt-team-widgets/4.6 into origin/4.6Olivier Goffart2009-10-136-77/+149
|\ \ \ | |/ /
| * | Merge commit '8df79a473e1a7e5c79b9b10827985bf3e9501002' into 4.6Alexis Menard2009-10-1242-1341/+1847
| |\ \
| * | | Fixed keyboard navigation for QTableViewGabriel de Dietrich2009-10-123-71/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyboard navigation didn't work in the following cases: - The last column was disabled and we pressed the tab key when at the 2nd last column. (See ref. task). - Spans with their anchor column or row hidden or disabled. - Navigation would not preserve the original row/column when traversing a span horizontally/vertically. Auto-tests submitted with this commit. Task-number: QTBUG-3878 Reviewed-by: Olivier
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-0914-56/+98
| |\ \ \
| * | | | Fixed a potential crash in QGraphicsScenePrivate::_q_polishItems()J-P Nurmi2009-10-092-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch make sure that we always start from the beginning of the unpolished items list and we erase the first value at each iteration. The patch also convert the list to a set that is more appropriate here. Merge-request: 1707 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| * | | | Fix context menu and menu key in QGraphicsView.Alexis Menard2009-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a weird bug when pressing the menu key on a proxy that embed a lineedit (but the proxy don't have the focus). At each time the key was pressed a context menu was created. When we press the menu key, QWidgetMapper will create a context menu event that will be sent to the QGraphicsView and will end up in QGraphicsScene. QGraphicsScene will then try to find all items under the mouse and will try to find any item from this list that accept this contextMenuEvent. In our case the proxy will always accept it and therefor will always send it to the widget that it owns and that's why we had this infinite numbers of QMenu. In QWidget world the context menu event is always sent to the widget that has the focus. If you checked any QWidget subclasses you'll see that all of them assume that when they get a context menu event everything is fine focus wise. We could have changed QGraphicsScene::contextMenuEvent but this will breaks some existing code. Instead we just checked that QGraphicsProxyWidget has the focus before we actually send the contextMenuEvent to the widget it owns. I have modified an existing auto-test to cover that. Be careful widget->setContextMenuPolicy(Qt::ActionsContextMenu) means that you will get no contextMenuEvent. :D. In this test i cover the standard use case and the one with Qt::ActionsContextMenu with and without the focus on the proxy. Task-number:QTBUG-3787 Reviewed-by:jan-arve
* | | | | Fixed a few compiler warnings from QtGui for Symbian.Janne Anttila2009-10-137-11/+16
| | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
* | | | | Doc: Gesture API documentation review.David Boddie2009-10-125-75/+119
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Fix default action in s60 drag'n'drop managerShane Kearns2009-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default action was always MoveAction, which removed the data from the source widget, even if not accepted anywhere. Now uses the default action from the base class manager. Task-number: QT-736 Task-number: QTBUG-4356 Reviewed-by: Aleksandar Sasha Babic
* | | | | Make QTextControl give the right default action to Drag managerShane Kearns2009-10-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dragging text from a non editable widget, QTextControlPrivate was passing allowed actions = CopyAction, default action = MoveAction. Default action is always used if you don't press any modifier keys, so text could be moved (cut) out of a non editable widget such as QLabel Task-number: QTBUG-4356 Reviewed-by: Aleksandar Sasha Babic
* | | | | Make writing out word-spacing use the right property.Thomas Zander2009-10-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ODF seems to not specify this property, while xslt (which odf copied for this) does, writing it out will be much more useful than loosing the info silently, though. Reviewed-by: Denis Dzyubenko
* | | | | Fixed a bug visible in QPrintPreview with the X11 XLFD font engine.Trond Kjernåsen2009-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFontEngineXLFD::boundingBox() function did not take justification into account when calculating the bounding box for a set of glyphs. Reviewed-by: Eskil
* | | | | Added documentation for the Gesture API.Denis Dzyubenko2009-10-127-27/+238
| | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
* | | | | Added support for singleshot gestures.Denis Dzyubenko2009-10-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a gesture recognizer claims to be in Finished state without any Triggered states before, that probably means that was a singleshot gesture that has started and ended right away, so we'll send a fake gesture in the GestureStarted state. Reviewed-by: trustme
* | | | | Fix for qapplication::testDeleteLaterProcessEvents autotest in Symbian.Janne Anttila2009-10-122-4/+5
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleting qt_desktopWidget eventually ends up to QSymbianControl destructor. Calling setFocusSafely from QSymbianControl destructor causes a new events to be posted to event queue. Posting events tries to wakeup event dispatcher, which was deleted in QApplication destructor before calling delete for qt_desktopWidget. This makes application to panic. The fix is to change is_app_closing and is_app_running flags to correct state immediately after event dispatcher is closed down, and check the is_app_closing flag in QSymbianControl destructor. The change fixes panic in qapplication::testDeleteLaterProcessEvents, and otherwise QApplication and QWidget autotest results are same as before change. Reviewed-by: Miikka Heikkinen Reviewed-by: Brad
* | | | Compile fix after the latest change to gesture api.Denis Dzyubenko2009-10-121-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | Forgot to remove the declaration from a source file because of a bad merge. Reviewed-by: Bradley T. Hughes
* | | | Fixed warnings autotest.Denis Dzyubenko2009-10-121-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
* | | | Removed the QGesture contructor that we don't really need.Denis Dzyubenko2009-10-122-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constructor that accepts a gesture type is not needed because the gesture type id will be generated by Qt and assigned to the QGesture object when a custom gesture recognizer is registered within the framework. Reviewed-by: trustme