summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed several qdoc error reports.Martin Smith2009-07-011-0/+16
| | | | | Also changed qdoc not to warn about undocumented parameters if the function is marked with the \reimp command.
* Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-302-3/+20
|\
| * Fix Toolbars in unified toolbar looking bad Carbon w/Fullscreen changesNorwegian Rock Cat2009-06-301-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a bug in the Carbon code when an item went in full-screen, than out with a unified toolbar. In those cases the toolbars would end up getting but into the mainwindow area. The reason this was happening was that we were calling transferChildren() after we had set up our toolbar. This cause problems because we end up pulling the QToolbars right out of the unified toolbar. The easiest way to solve this is to just update the status on it again. This should solve any issues. I also added some logic to avoid calling this too many times in that one case. Luckily, this seems to only affect Carbon. Task-number: 254462 Reviewed-by: Jens Bache-Wiig
| * Doc: About menu on the Mac gets the application name from Info.plist.Geir Vattekar2009-06-301-1/+3
| | | | | | | | | | Task-number: 256818 Reviewed-by: Trenton Schulz
* | Merge branch '4.5'Marius Storm-Olsen2009-06-302-4/+13
|\ \ | |/
| * QWidget::adjustSize() sends a spontaneous event - Mac OS X CocoaPrasanth Ullattil2009-06-302-2/+12
| | | | | | | | | | | | | | | | The windowDidResize notification now differentiates an internally triggered resize from a user triggered resize. Task-number: 256269 Reviewed-by: Norwegian Rock Cat
| * Always turn on shadows for Cocoa.Norwegian Rock Cat2009-06-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Frameless windows wouldn't get shadows in Cocoa, which they do in Carbon. You can argue over who is more correct, but the fact is they can't be inconsistent. Since Cocoa is the newcomer, I'm bending that. Though it would seem useful to have an ability to provide some developer control over the shadow. At the moment, the only thing we have to ensure is that we always turn on the shadow. Task-number: 254725 Reviewed-by: Denis
* | qdoc: Added more handling of \reimp commandMartin Smith2009-06-301-10/+23
| | | | | | | | | | | | Also fixed a few qdoc error reports. Task-number: 162182, 222650
* | Fixed QLayout to take the maxi/min size into account for the menu barThierry Bastian2009-06-301-1/+4
| | | | | | | | | | | | | | It was only taking the sizeHint into account Task-number: 141355 Reviewed-by: jasplin
* | Fixed compile with Windows CE 5.Rohan McGovern2009-06-291-0/+4
| | | | | | | | On some systems, math.h still doesn't define M_PI.
* | Fix license headers after multitouch+gestures merge.Jason McDonald2009-06-2913-65/+65
| | | | | | | | | | | | | | Commercial license headers belong in source packages only. The repo must have the pre-release license headers. Reviewed-by: Trust Me
* | Fix old/missing license headers from multitouch+gestures merge.Jason McDonald2009-06-2915-43/+43
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5'Thiago Macieira2009-06-281-2/+2
|\ \ | |/
| * Fix painting errors in QScrollArea on Mac (Carbon)Morten Sørvig2009-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mainly a stop-gap solution for 4.5.x. It trades painting performance for correct painting. Commit 7988d05da changed the opaque test from q->testAttribute(Qt::WA_OpaquePaintEvent) to qt_widget_private(w)->isOpaque in qt_mac_update_widget_posisiton. This means we'll do optimized moves in more cases. Unfortunately it also causes painting errors in some cases (see the task). Revert the commit for now to put the 4.5 branch in a god shape. Task-number: 252295 Reviewed-by: nrc
* | Fixed compile on Unix.Rohan McGovern2009-06-271-0/+1
| | | | | | | | | | Fixes error: src/gui/kernel/qevent_p.h:62: error: invalid use of incomplete type ‘struct QKeyEvent’
* | Compile on WinCEBradley T. Hughes2009-06-261-6/+8
| | | | | | | | | | | | | | Replace the SIZE constant with an Enum with a Qt-ish CamelCased name (since SIZE conflicts with the system headers). Reviewed-by: TrustMe
* | Cleanup includes in public headers.Bradley T. Hughes2009-06-265-4/+4
| | | | | | | | We don't want to pull in too much if we can avoid it.
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-262-4/+22
|\ \
| * | Improved support for DPI on Mac and Vista/7Jens Bache-Wiig2009-06-251-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This significantly improves the support for higher DPI-values on these platforms by ensuring that common pixelmetrics are scaled accordingly. In addition we mark all Qt apps as DPI-aware on Windows 7 by calling SetProcessDPIAware. We also changed the way we draw pixmaps on the mac paintengine when using dpi scaling > 1 to ensure smooth pixmap scaling. Reviewed-by: nrc Task-id: 242417
| * | Only instantiate the PICT pasteboard MIME when we have to.Norwegian Rock Cat2009-06-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10.6 does a lot of image synthesis for us when we put up a tiff, which is great because we don't have to do a thing and it will work with all the applications out there. This means we don't need our PICT convertor on 10.6 for 32-bit apps. However, this magic doesn't exist in earlier versions of Mac OS X, so we have to keep it around (along with the QuickTime symbol resolving) there. Reviewed-by: Morten Sørvig
| * | Cannot move fixed size windows using titlebar (only on top edge)Prasanth Ullattil2009-06-251-3/+7
| | | | | | | | | | | | | | | | | | | | | WM_NCHITTEST has to return the location type based on the position, instead of returning just true or false. Reviewed-by: Marius Storm-Olsen
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-2414-235/+179
|\ \ \ | |/ / | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| * | More culling of Panther Code.Norwegian Rock Cat2009-06-234-192/+110
| | | | | | | | | | | | | | | | | | Removed lots of places where we check for Tiger. Now we can assume it. Reviewed-by: Morten Sørvig
| * | Clean up the font hash and palette hash stuff.Norwegian Rock Cat2009-06-233-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | These are used enough (at least on the mac) to justify them being accessible in a private header. As a bonus it "hides" the actual container being used, so we could potentially sway it out with something different. Reviewed by: Jens Bache-Wiig
| * | Scroll the dirty parts of the scroll area in scrollby for Cocoa.Norwegian Rock Cat2009-06-231-14/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ah! One less ###! The scroll functions in Carbon and Cocoa don't scroll the regions that have been marked dirty. In the past, we killed performance by updating the whole view. We got a workaround for Carbon in the form of an SPI, but I wasn't aware of a corresponding item in the NSView API, but it is there publically and available in 10.5. Fast scrolling in Cocoa now for people who like to use the keyboard. Reviewed by: Morten Sørvig
| * | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-236-18/+50
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebKit/qt/ChangeLog tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | * Remove some warnings in the Cocoa build.Norwegian Rock Cat2009-06-236-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After discussing with some of the Objective-C people I have finally got a fair number of the warnings to disappear in both 10.5 and 10.6. I also took the opportunity to remove a bunch of other warnings. Reviewed by: Morten Sørvig
| * | Fixed build error on X11 with gcc 4.1.2.jasplin2009-06-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | gcc 4.1.2 on X11 somehow confuses assignment of a temporarily constructed QSettings object to a reference with invalid access to the private assignment operator of QSettings. Reviewed-by: mgoetz
* | | Multi-touch, Cocoa: Make sure that touch points are ordered.Richard Moe Gustavsen2009-06-241-7/+7
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouchBradley T. Hughes2009-06-243-7/+7
|\ \ \
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouchBradley T. Hughes2009-06-242-6/+6
| |\ \ \
| | * | | Multitouch, Cocoa: Implement normalized positionRichard Moe Gustavsen2009-06-232-6/+6
| | | | |
| * | | | Fix pressure "emulation"Bradley T. Hughes2009-06-241-1/+1
| |/ / / | | | | | | | | | | | | | | | | Update the auto test for QTouchEvent to make sure the pressure is set to 1 for Pressed/Moved/Stationary, but for 0 for Released.
* | | | Add QTouchEvent::DeviceType and deviceType()Bradley T. Hughes2009-06-247-29/+82
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | This enum indicates what kind of device generated the touch event (TouchScreen or TouchPad). We use this information to control how touch events are sent, specifically we restrict touch events to a single widget/QGraphicsItem on touch-pads, since there is no direct relationship between the physical touch location on the pad and the on- using the touch-pad).
* | | Compile on WindowsBradley T. Hughes2009-06-231-2/+2
| | |
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouchBradley T. Hughes2009-06-231-1/+6
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication.cpp
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouchBradley T. Hughes2009-06-231-6/+2
| |\ \ \
| * | | | Set the pressure automatically if not set by the touch implementationBradley T. Hughes2009-06-231-1/+6
| | | | |
* | | | | Add functions to report normalized positions in QTouchEvent::TouchPointBradley T. Hughes2009-06-235-2/+72
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces normalizedPos(), startNormalizedPos(), and lastNormalizedPos() in QTouchEvent::TouchPoint, and must be set by the implementation before being fed into Qt. We are assuming and hoping that these functions will make it easier to implement certain types of gestures (especially on a touchpad).
* | | | Compile with arm-linux-g++ 4.2.1 in scratchboxBradley T. Hughes2009-06-231-6/+2
|/ / /
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-231-21/+27
|\ \ \ | |/ /
| * | QApplication: Reduce number of kdeglobals file loadsMarkus Goetz2009-06-221-21/+27
| | | | | | | | | | | | | | | | | | From 14 per X11 application down to 4. Reviewed-by: jbache
* | | Fix qdoc warnings for QTouchEventBradley T. Hughes2009-06-222-6/+5
| | |
* | | Multitouch, Cocoa: Added Qt::WA_TouchPadAcceptSingleTouchEventsRichard Moe Gustavsen2009-06-223-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | By default this is set to false, meaning you will only get multitouch events. The reason why this is important is that we use the first touch of a new touch sequence to find out which widget to send the subsequent touches to. And on a touchpad, you normally want this to be the widget under the cursor when more than one finger is pressed on the pad.
* | | Multitouch, Cocoa: clean up the code a bitRichard Moe Gustavsen2009-06-221-12/+4
| | |
* | | Multitouch, Cocoa: Mask mouse hover from the touch setRichard Moe Gustavsen2009-06-223-80/+88
| | | | | | | | | | | | | | | After a lot of thinking, the conclusion is that we really need to to this. Lets see if we can add a flag to control it next.
* | | Handle the case where TOUCHINPUT id numbers are not reusedBradley T. Hughes2009-06-191-0/+8
| | | | | | | | | | | | | | | | | | As documented in the Windows 7 SDK RC, the id's may not be reused. We don't want the touchInputIDToTouchPointID hash to grow indefinitely, so clear it each time we detect that all touch points have been released.
* | | Compile on Windows againBradley T. Hughes2009-06-191-4/+2
| | |
* | | Multitouch, Cocoa: First revision of multi touch in Qt/CocoaRichard Moe Gustavsen2009-06-197-12/+410
| | |
* | | Make sure QTouchEvent::TouchPoint::rect() returns the proper rect...Bradley T. Hughes2009-06-181-1/+1
| | | | | | | | | | | | ... and not the screenRect