summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Forgot to export QGestureRecognizer class.Denis Dzyubenko2009-05-111-1/+1
|
* Fixes: Add missing functions for a adding custom gesture recognizers.Denis Dzyubenko2009-05-114-7/+33
|
* Fixes: Compilation fixesDenis Dzyubenko2009-05-111-0/+1
|
* If the event wasn't consumed by the gesture target widget, thenDenis Dzyubenko2009-05-111-3/+4
| | | | gesture manager should consume it as well.
* Fixes: improved gesture manager event filtering.Denis Dzyubenko2009-05-111-20/+23
| | | | | | Details: Several fixes - parsing only spontaneous mouse events and send gesture events to QGraphicsSceneItems according to their z-order
* Fixes: reset the internal gesture state when gesture in state 'maybe' is ↵Denis Dzyubenko2009-05-111-1/+1
| | | | finished.
* Added some documentation.Denis Dzyubenko2009-05-115-11/+128
| | | | Fixed missing const specifiers.
* Fixed lastDirection in the Pan gesture.Denis Dzyubenko2009-05-112-17/+32
|
* Merge of the maemo-gestures branch onto qt/4.5.0Denis Dzyubenko2009-05-1121-4/+2319
| | | | | This is a squashed merge of all of the changes in the maemo-gestures branch on-top of the qt/4.5.0 branch.
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-111-2/+2
|\
| * removed more exports on private classes (QMouseEventEx and QKeyEventEx)Thierry Bastian2009-05-081-2/+2
| |
* | by default, ignore touch events if the widget is disabledBradley T. Hughes2009-05-081-0/+3
| |
* | set qt_tabletChokeMouse to true whenever ANY touch event was acceptedBradley T. Hughes2009-05-081-3/+2
| | | | | | | | this makes sure we always get touch events, and the don't drop out seemingly randomly.
* | don't store event state in QWidgetPrivateBradley T. Hughes2009-05-082-17/+20
| | | | | | | | | | the only thing we store in the QWidgetPrivate is the current touch point list, nothing more (the rest is local state in the event translation code)
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-05-0811-154/+220
|\ \ | |/ | | | | windows-7-multitouch
| * Merge branch '4.5'Thiago Macieira2009-05-072-2/+22
| |\ | | | | | | | | | | | | | | | Conflicts: src/gui/painting/qbackingstore.cpp src/gui/painting/qwindowsurface_raster.cpp
| | * handle the back soft key on Windows mobile SmartPhonesJoerg Bornemann2009-05-071-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | We must tell the system that we want to intercept the back key on Windows mobile. Each toplevel widget that needs correct back key behaviour needs to have a menu bar. Why? Ask Microsoft... Task-number: 248846 Reviewed-by: thartman
| | * qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-074-119/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. Task-number: 252496 252492
| | * Fix strange context menu related bug on Windows MobileThomas Hartmann2009-05-071-2/+7
| | | | | | | | | | | | | | | | | | | | | Fixes 245347 again and does not trigger 252319 Task-number: 245347 Reviewed-by: Maurice
| * | qdoc: Moved platform-specific qdoc comments to common .cpp file.Martin Smith2009-05-074-120/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | When building docs for the mac, qdoc comments for functions defined in the .h file were not found in any of the .cpp files in the mac package because they were in the x11 or windows .cpp file. So I moved them to a .cpp file that is in all the packages. Task-number: 252496 252492
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-068-32/+66
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp
| | * Crash in QWidget::render when passing an untransformed QPixmap painter.Bjoern Erik Nilsen2009-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash only occurred on Windows and X11 when running with -graphicssystem raster. The reason is that the actual paint device in QRasterPaintEngine::begin() is changed to pixmap->data->buffer(), which means QPaintEngine::paintDevice() returns something else than what it was told to paint on (see cb0c899b56b84154f69ddc545991bc6ded96ab01) The root of the problem, however, was that we used a weird condition (painter->worldMatrixEnabled(), added in 345072b9 for Qt 4.4) to find the target device. We did that because the shared painter was completely different in 4.4. We refactored it in 4.5.0, and we can only trust QPaintEngine::paintDevice to be the target device. Auto-test included. Task-number: 252837 Reviewed-by: Trond
| | * Optimize QCocoaView::registerDragTypes and mode switching in QtCreator.Morten Sørvig2009-05-063-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were registering the types each time drag and drop was enabled, which caused slowdowns when for example switching between the Edit and Debug modes in QtCreator. Instead, register the types on first enable and also when the custom types change. Add check to draggingEntered() that disables the drag if WA_DropSiteRegistered is false. Reviewed-by: nrc
| | * QComboBox: Click-drag-release does not work for combo boxes using CocoaRichard Moe Gustavsen2009-05-061-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that the mouse event was redirected to the active pop-up, while it should have been redirected to the widget under the mouse under the active popup. This patch does the correct redirection Task-number: 252259 Reviewed-by: Trenton Schulz
| | * Mac OS X QWidget::setMinimumSize locks.Richard Moe Gustavsen2009-05-062-43/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was code for updating the size constrains inside setConstraints_sys. This is now added. Factored out the code that does this into a function, and since we never applied size constraines on a window upon creation, I also added an extra call from that code part Task-number: 219695 Reviewed-by: Trenton Schulz
| | * Make command-quit not terminate the program on Qt/Cocoa.Morten Sørvig2009-05-051-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Instead instigate the quit by calling QApplication::quit(), using the code that was already in place. This allows QApplication::exec() to return normally and prevents resrouce leaks for objects created on the stack in main(). Reviewed-by: nrc
| | * On Windows loosing focus should result in clearing focus if widget is ↵Denis Dzyubenko2009-05-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | embedded somewhere. If a widget is embedded to non-Qt window on Windows, then we should still clear the focus whenever we receive WM_KILLFOCUS since we won't get WM_ACTIVATEAPP in this case. This is an addition to 6ed196051d0f19bfe2d045eaf12f5f5ca30670d0 Task-number: 251259 Reviewed-by: Thierry
| | * Added a check that X11 timestamp goes forward only.Denis Dzyubenko2009-05-041-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | Got a case somehow with a timestamp of the mouse event that is less than the timestamp we already had, so we need to make sure time only goes forward. Reviewed-by: Brad
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-05-064-31/+19
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | Fix focus issues in QX11EmbedContainer, affecting Flash plugin in QtWebKit.Kenneth Rohde Christiansen2009-05-061-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are now moving focus to the XEmbed focus proxy when we accept a client and when we get window activation. Window activation did that before, but only when we were the active container, thus had focus in. Now we do it always. Due to race conditions with the window manager, the time stamt we used for XSetInputFocus was the same as that of the window manager. This broke it from time to time in Metacity and Xfce but always in KWin. With other tested window manager we didn't have this issue. Following Owen Tayler's advice (one of the authors of the XEmbed specification) we now use CurrentTime and not qt_x11Data->time when moving the input focus as there is no explicit user interaction involved. Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
| * | Fix QFormLayout which allowed fields to be smaller that their minimum sizeOlivier Goffart2009-05-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the label's sizeHint is bigger than its minimumSizeHint, the field may be resized smaller than its minimum size. This also fix another problem where the field would 'jump' from one sizehint to the others. (This can happen if labels can word-wrap for example) Reviewed-by: Michael Goddard
| * | Fixed handling of XA_PIXMAP format type in QClipboard on X11.Denis Dzyubenko2009-05-052-19/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When requesting image/ppm type we didn't return the proper pixmap because type 'PIXMAP' is not a proper image format name, but a reserved atom, so the fix is to remove redundant check that was triggered before we entered the actual function that tries to convert the clipboard content. Task-number: 252501 Reviewed-by: Brad
* | | fix QtOpenGL compilation, add missing includeBradley T. Hughes2009-05-061-0/+1
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-05-049-73/+97
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | When data was copied from Mozilla Firefox to Qt, the text format was not valid.Denis Dzyubenko2009-05-041-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mozilla encodes the text/html format in UTF16 and adds a BOM, however it doesn't specify the charset in the html header. The fix is to guess the encoding by either charset in the html header or BOM for text/html format, or by BOM for non html formats. This commit adds a new public function QTextCodec::codecForUtfText() which can be used to guess encoding out of the BOM. Task-number: 250555 Reviewed-by: Benjamin Poulain Reviewed-by: Simon Hausmann Reviewed-by: Andreas Aardal Hanssen
| * | Deprecate qt_mac_set_show_menubar for a public cross-platform API.Norwegian Rock Cat2009-05-043-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm tired of these "hidden" functions. We have an AA_MacPluginApplication, but sometimes you may have a legitimate reason for setting this outside of "plugin applications." In the footsteps of the menu icon attribute, the attribute is the main leader, but menubars can disable/enable this locally the new QMenuBar::setNativeMenuBar() property. Otherwise, the menubars take their que from the application attribute. This also works for Windows CE. So, there is a bit on convergence as well. Task-number: 236757
| * | Merge commit 'origin/4.5'Olivier Goffart2009-05-042-11/+23
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| | * Ensure that we send the Apple Events even when Cocoa isn't ready.Norwegian Rock Cat2009-05-042-11/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In general, Cocoa handles the the Apple Events for us. However, this is time between creating the NSApplication and Cocoa has set everything up, usually after the event loop is running. This means that until that time, the events are dropped on the floor :-/. The workaround is to use the same handler that we use for Carbon, but to only have it enabled for until Cocoa is ready to handle things. This will result in not stepping on the toes when used in a plugin (if it does, we can conditionalize it). Task-number: 252795 Reviewed-by: Richard Moe Gustavsen
| * | Mac: QWidget::setMinimumSize does not workRichard Moe Gustavsen2009-05-042-43/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that we never applied the new max min values on the native window itself. This patch does that, and also makes sure that we do this on the appropriate times (window creation, etc) Task-number: 219695 Reviewed-by: Trenton Schulz
| * | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-292-3/+8
| |\ \ | | |/
| | * Wrong clip in QWidget::render(QPainter *, ...) when using Qt::(Replace|No)Clip.Bjoern Erik Nilsen2009-04-291-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that we didn't take the painter's clip into account when setting the system viewport ("hard clip"). We only used the system clip, but we have to use system clip + painter clip, which is the current engine clip. Unfortunately, we have to calculate it again since there's no cross-platform way of retrieving it. This was only a problem with Qt::(Replace|No)Clip, since we in all other cases combine the old clip with the new one. (Uber cool) auto test included. Task-number: 250482 Reviewed-by: Samuel
| | * Corrected description of the QLayout::takeAt() functionMorten Engvoldsen2009-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | An item is not deleted when removed from the index. The remaining items get a new index. I changed deleted to removed. Tasknumber: 252547 Rev-by: janarve
* | | Support sending touch events (with multiple touch points) to multiple ↵Bradley T. Hughes2009-05-046-76/+141
| | | | | | | | | | | | | | | | | | | | | widgets simultaneously This is a first attempt, and it works, but it will need to be cleaned up to remove as much state from QWidgetPrivate as possible.
* | | Initialize activeTouchPoints in the loop itself instead of beforeBradley T. Hughes2009-05-041-2/+4
| | | | | | | | | | | | This will make it easier to make the change to sending touch events to multiple widgets.
* | | Use the HWND from the Windows MSG to find which widget to send events toBradley T. Hughes2009-04-302-33/+34
| | | | | | | | | | | | the logic for determining the event type has refactored as well
* | | Determine whether TouchBegin or TouchEnd should be sent at the time of ↵Bradley T. Hughes2009-04-301-3/+6
| | | | | | | | | | | | | | | | | | touchpoint addition/removal This will make it easier to change later when supporting touching multiple widgets
* | | Don't call RegisterTouchWindow() if we don't have a window idBradley T. Hughes2009-04-301-1/+1
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-2914-119/+145
|\ \ \ | |/ / | | | | | | windows-7-multitouch
| * | introduce Q_WS_WINCEMaurice Kalinowski2009-04-2910-106/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-293-13/+33
| |\ \ | | |/