summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0428-392/+494
|\
| * Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-0426-385/+487
| |\ | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | * Compile fix after the last gesture api changeDenis Dzyubenko2009-11-036-55/+47
| | | | | | | | | | | | Reviewed-by: trustme
| | * Toolbar Icons are clipped on Leopard in Cocoa port.Prasanth Ullattil2009-11-031-1/+2
| | | | | | | | | | | | | | | | | | | | | Scale the pixmap to correct size (16,16) before setting as the image for the Document Icon button. Reviewed-by: Denis
| | * Gesture api review.Denis Dzyubenko2009-11-0317-212/+236
| | | | | | | | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| | * Modified gesture events propagation.Denis Dzyubenko2009-11-032-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default if the gesture is ignored, only gestures in the started state are propagated, and accepting a gesture in the started state adds an implicit grab meaning all the following events in the gesture sequence will be delivered to that widget. This is similar to the way QTouchEvent is propagated. Also added a hint, which specifies if gestures in any state can be propagated to the widget which has enabled the hint. Reviewed-by: Thomas Zander
| | * Made native Pan gesture work on Windows.Denis Dzyubenko2009-11-035-19/+29
| | | | | | | | | | | | Reviewed-by: trustme
| | * Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-038-91/+123
| | | | | | | | | | | | Reviewed-by: trustme
| | * Added QGraphicsObject::ungrabGesture()Denis Dzyubenko2009-11-031-2/+2
| | | | | | | | | | | | | | | | | | | | | Oops, apparently we forgot to add a function for unsubscribing a graphics object from a gesture. Fixing it now. Reviewed-by: trustme
| | * Documentation fixes related to gestures doc.Denis Dzyubenko2009-11-032-3/+4
| | | | | | | | | | | | Reviewed-by: David Boddie
| | * Titlebar icon (for e.g. Assistant) not visible in Cocoa.Prasanth Ullattil2009-11-023-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | standardWindowButton:NSWindowDocumentIconButton will not return a valid NSButton unless you call setRepresentedURL or setRepresentedFilename for the NSWindow. This patch makes sure that setWindowIcon_sys() sets the icon using a valid NSButton. Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
| | * Make GestureCancelPolicy work for graphicsviewThomas Zander2009-10-303-22/+18
| | | | | | | | | | | | Reviewed-By: Denis
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-platform-team into 4.6Bradley T. Hughes2009-10-3026-229/+806
| | |\
| * | \ Merge branch '4.6-s60' into 4.6axis2009-11-042-45/+78
| |\ \ \
| * | | | QGtkStyle refactoringRobert Griebl2009-11-032-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGtk class has been refactored into a private d class for QGtkStyle. This allows us to re-use a lot of code for the Maemo5 style without changing a single line in QGtkStyle itself plus we can easily add virtual functions where the two styles need to behave different. There shouldn't be any new functionality added (or old functionality lost) by this commit. Reviewed-By: jbache Reviewed-By: Ralf Engels
| * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-031-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
| | * | | | Doc: Fixed qdoc warnings.David Boddie2009-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | Fixed modal dialog fading support in Symbian.Janne Anttila2009-11-043-4/+25
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switched to use S60 API instead of Symbian one, the rationale is given below as an copy/paste from S60 docs: "Cross-application fading support Symbian OS provides some support for fading, but this only covers fading within an application. The S60 UI can have more than one application on the screen at once (in fact, since the system parts of the Status pane are inside EikServer, it always has more than one application on the screen). The S60 UI introduced the fading and drawing system to manage the fading state for the whole system. Application and UI control code for S60 should not attempt to set fade for a popup window directly. Instead, the popup window should implement the MAknFadedComponent interface, and should use the TAknPopupFader support class to set the fade. The application UI base classes interact with the fading and drawing system by informing it when the foreground status of the application changes. They also use it to implement system wide fading." There is also task QTBUG-5393 to implement fading support in future without S60 dependency. Task-number: QTBUG-5181 Reviewed-by: Sami Merila
* | | | | Fix cleanupstack crash on exit in Symbian OS 9.2Shane Kearns2009-11-031-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Destroying the control environment also pops items from the original cleanup stack which is not owned by the control environment. This is a platform issue (and does not occur in 9.3 & 9.4). To avoid this causing a panic, the s60main is changed to not push items on the cleanup stack (instead, it TRAPs the call to main(), and deletes its allocations manually). A further 9.2 cleanup stack crash was caused when application construction fails (because of missing resource files). The resulting exception would bypass deleting the control environment, and return from main with the wrong cleanup stack active. This is resolved by doing the TRAP / cleanup / throw manually instead of using qt_trap_throwing (The control environment cannot be pushed to the cleanup stack, because it owns the cleanup stack at that time). This isn't a 9.2 specific bug, but rather is revealed by 9.2 because the missing resource file is non fatal in 9.3 and 9.4. Fixes many autotests which have crashed on S60 3.1 since the cleanup stack swapping patch. Reviewed-by: axis
* | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0333-261/+890
|\ \ \ \ \ | |/ / / /
| * | | | Merge commit 'origin/4.6' into featureJørgen Lind2009-11-0233-326/+869
| |\ \ \ \
| | * \ \ \ Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-3026-229/+806
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Ensure that button returns 0 for mouse move eventsDean Dettman2009-10-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a platform regression for the cocoa platform Reviewed-by: Prasanth
| | | * | | Replaced QMap with QHash where possible in the gesture manager implementation.Denis Dzyubenko2009-10-282-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to use QMap when the key is a pointer. Reviewed-by: Thomas Zander
| | | * | | Tiny doc change by David Boddie.Denis Dzyubenko2009-10-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | * | | Delete all gesture objects and recognizers when gesture manager is deleted.Denis Dzyubenko2009-10-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When application closes and we haven't deleted the unregistered gestures and gesture recognizer, we should delete them. Reviewed-by: Thomas Zander
| | | * | | Fixed the gesture event filtering through multiple gesture recognizers.Denis Dzyubenko2009-10-282-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are several gesture recognizers registered for the same gesture type, we need to know which recognizer we need to get a state object for since those QGesture objects are tied to the recognizer that created them. Reviewed-by: Thomas Zander
| | | * | | Removed obsolete private field from the QGesture and fixed the doc.Denis Dzyubenko2009-10-283-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thomas Zander
| | | * | | Mark the QGestureEvent::setWidget as internalThomas Zander2009-10-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The widget() getter is still publicly documented, follow the lead of other events to make the setter internal.
| | | * | | Make the un/registerGestureRecognizer methods staticThomas Zander2009-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As QApplication is a singleton this makes usage of these easier and also in line with many other methods on the class.
| | | * | | Rename private member variables to begin with m_Thomas Zander2009-10-282-67/+66
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | * | | Drag and drop of plain text doesnot work on Mac.Prasanth Ullattil2009-10-283-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While querying for the text in the pasteboard, it was looking in the wrong place. The helper function qt_mac_get_pasteboardString() always searched in generalPasteboard instead of the pasteboard referred by the QMacPasteboard. Reviewed-by: MortenS
| | | * | | Introduce QGesture::GestureCancelPolicy, a way to auto-cancel gesturesThomas Zander2009-10-285-7/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On accepting one gesture Qt can automatically cancel other gestures that belong to other targets. The policy is normally set to not cancel any other gestures and can be set to cancel all active gestures in the context. For example for all child widgets. Reviewed-By: Denis Dzyubenko
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into ↵Bradley T. Hughes2009-10-2816-127/+574
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | 4.6-WM_NULL-driven
| | | | * | | Emit workAreaResized() in X11 when it changesGustavo Pichorim Boiko2009-10-272-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit the QDesktopWidget::workAreaResized() signal when the _NET_WORKAREA property of the root window changes. Merge-request: 1111 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | | | * | | Fill gap of X.org/XFree multimedia/special/launcher keysHelio Chissini de Castro2009-10-272-91/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X Merge-request: 1742 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | | | * | | Renamed QGestureRecognizer::ResultFlags to ResultFlagDenis Dzyubenko2009-10-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decided after review by David Boddie. Reviewed-by: trustme
| | | | * | | Implemented QGestureRecognizer::ConsumeEventHintDenis Dzyubenko2009-10-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: trustme
| | | | * | | Removed the obsolete documentation reference from the QGesture.Denis Dzyubenko2009-10-261-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | | Fix the debug output to be correct again after refactoringThomas Zander2009-10-261-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | | | * | | Fix memory leaks in the gesture managerThomas Zander2009-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | | | * | | Add QWidget::ungrabGestureThomas Zander2009-10-264-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | | | * | | Implement QApplication::unregisterGestureRecognizerThomas Zander2009-10-263-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | | | * | | Added convenience functions QGestureEvent::setAccepted with a gestureDenis Dzyubenko2009-10-262-5/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type argument. Reviewed-by: Thomas Zander
| | | | * | | Implemented QGestureEvent::activeGestures and canceledGestures.Denis Dzyubenko2009-10-261-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thomas Zander
| | | | * | | Optimisation for filtering events for gestures in graphics view.Denis Dzyubenko2009-10-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't add several graphicsobject contexts for the same gesture type when looking for the gesture-enabled QGraphicsObject under a hotspot. Reviewed-by: Thomas Zander
| | | | * | | Merge branch '4.6' into 4.6-platformDenis Dzyubenko2009-10-2623-279/+593
| | | | |\ \ \
| | | | * | | | Remove internal widgets from QApplication::topLevelWidgets()Prasanth Ullattil2009-10-233-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have some internal hidden widgets which should not come up in the QApplication::topLevelWidgets() list. So the known ones are being removed from the QWidgetPrivate::allWidgets set. Task-number: QTBUG-739 Reviewed-by: Denis Dzyubenko Reviewed-by: Bradley T. Hughes
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-drivenBradley T. Hughes2009-10-2828-339/+646
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | / / | | | | | |/ / | | | | |/| |
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-drivenBradley T. Hughes2009-10-221-0/+11
| | | |\ \ \ \
generated by cgit v0.12 at 2025-01-20 16:49:49 (GMT)