summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Fixed resizing popups with QSizeGrip on X11Denis Dzyubenko2011-02-101-1/+3
| | | | | | | | | Qt::Popup implicitly means Qt::X11BypassWindowManagerHint, and according to ICCCM 4.1.5 window manager should not move or resize windows that have override-redirect flag set (i.e. X11BypassWindowManagerHint). Task-number: QTBUG-11447 Reviewed-by: Olivier Goffart
* Fixed mapFromGlobal in some window managers on X11Denis Dzyubenko2011-02-081-1/+16
| | | | | | | | | | | | The previous mapFromGlobal optimization in cdd776a91e65bf5c30cea1bab9823134a3f797d0 broke behavior in some window managers like metacity when resizing by dragging the top-left corner. Most likely it is a bad behaviour of the window manager (according to ICCCM 4.1.5 we should get a ConfigureNotify event with x and y in root coordinates if you consider this is a "movement" of a window). Reviewed-by: Olivier Goffart
* Removed obsolete code that was incorrectly handling ConfigureNotifyDenis Dzyubenko2011-02-081-13/+1
| | | | | | | | | | | The code in question was calling XSync and then processing ConfigureNotify requests, but only using the width/height information from the event, while ignoring the x,y properties. The code was consuming synthetic ConfigureNotify with x,y in root coordinate system that we are supposed to receive from the window manager, which broke mapFromGlobal/mapToGlobal behavior (after cdd776a91e65bf5c30cea1bab9823134a3f797d0) Reviewed-by: Olivier Goffart
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-01-311174-3092/+4516
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-01-281-1/+1
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.
| | * Merge remote branch 'qt-fire-review/master'aavit2011-01-281-1/+1
| | |\
| | | * Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.Samuel Rødal2011-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made toHsl() work the same way as toHsv(), ensuring the hue gets set to USHRT_MAX and not 0. Task-number: QTBUG-16530 Reviewed-by: Eskil Abrahamsen Blomfeldt
| * | | Cocoa/Alien: fix qgraphicseffectsource autotestRichard Moe Gustavsen2011-01-281-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test discovered a serious bug where we for alien widgets on mac returned a zero sized paintdevice. The reason is that we used to ask the nsview backing the widget for its size, but with alien, there where no such view. Very strange that this was not seen visually for any of the many applications tested. This patch does the same implementation strategy as found in QWidget::metric in qwidget_x11.cpp
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-2725-1303/+1773
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-01-2625-1303/+1773
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: non-native toolbar shows in window when hidden Cocoa: disable scroll optimization for certain cases Cocoa: fix scroll optimization bug Cocoa: add scroll optimization when scrolling both hor and ver Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4 Cocoa: remove compiler warning Add support for disabling touch on to enhance scrolling in Cocoa Cocoa/Alien: replace depricated API Cocoa/Alien: remove unneded code for scrolling with alien Cocoa/Alien: keep the scrolling within correct bounds Cocoa/Alien: bugfix scrolling, dirty region issue Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgets Cocoa: enable more autotests for qwidget as a result of Alien Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask) Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engine Alien implementation for the Cocoa port
| | | * Cocoa: non-native toolbar shows in window when hiddenRichard Moe Gustavsen2011-01-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason is that we explicitly needs to tell it to hide which we do in the init function. But since QToolBar overrides setVisible, this fails. This patch makes sure we call the super version of the function
| | | * Cocoa: disable scroll optimization for certain casesRichard Moe Gustavsen2011-01-252-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | No reason to use the optimization when only scrolling in one direction. In those cases we are better off scrolling immidiatly when requested to minimize the shuffling of scrolls and repaints done by the application
| | | * Merge remote branch 'qt-water-staging/master' into alien-merged-mainlineRichard Moe Gustavsen2011-01-255-227/+283
| | | |\
| | | * | Cocoa: fix scroll optimization bugRichard Moe Gustavsen2011-01-243-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The optimization commited a few commits before this one faulty stopped normal dispatching of enter/leave. This patch fixes this.
| | | * | Cocoa: add scroll optimization when scrolling both hor and verRichard Moe Gustavsen2011-01-244-0/+70
| | | | |
| | | * | Partly revert b1c715f8214233f5b573ed58fc89c9dd70beabb4Richard Moe Gustavsen2011-01-242-4/+2
| | | | |
| | | * | Cocoa: remove compiler warningRichard Moe Gustavsen2011-01-241-2/+1
| | | | |
| | | * | Add support for disabling touch on to enhance scrolling in CocoaRichard Moe Gustavsen2011-01-248-11/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac/Cocoa, enabling touch on a widget slows down the scrolling performance of the whole application. It seems Cocoa spends some time in the background figuring out what to do with the touch events, and whether or not it should convert them to scroll/wheel events. Therefore, it makes sense to no subscribe for touch when the mouse is not over the widget, This patch implements that strategy, and the effect is huge when tested agains creator. Rev-By: brad
| | | * | Cocoa/Alien: replace depricated APIRichard Moe Gustavsen2011-01-211-1/+1
| | | | |
| | | * | Cocoa/Alien: remove unneded code for scrolling with alienRichard Moe Gustavsen2011-01-211-6/+1
| | | | |
| | | * | Cocoa/Alien: keep the scrolling within correct boundsRichard Moe Gustavsen2011-01-212-26/+11
| | | | |
| | | * | Cocoa/Alien: bugfix scrolling, dirty region issueRichard Moe Gustavsen2011-01-211-45/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When scrolling a widget we also need to scroll the already marked dirty regions on the widget along with the scroll. Since we might end up scrolling several time before a drawRect is called (normal with inertia scrolling), we need to mark exposed areas during scrolling as dirty as well, so they get handled correctly on subsequent scrolls.
| | | * | Cocoa/Alien: let QWidget::scroll_sys handle overlapping widgetsRichard Moe Gustavsen2011-01-202-5/+25
| | | | |
| | | * | Cocoa/Alien: fix qwidget autotest (setClearAndResizeMask)Richard Moe Gustavsen2011-01-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we alien is in use, several of the auto tests are that needed special handling for mac before, are now expected to pass. Which they also do. This patch turns them on :)
| | | * | Cocoa: fix qwidget autotest (optimizedResizeMove) for raster engineRichard Moe Gustavsen2011-01-191-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In setGeometry_sys we used to call invalidateBuffer. This function does not take into account widgets with static contents when resizing. invlidateBuffer_resizeHelper does. The new code with this patch will make setGeometry_sys work the same way as in qwidget_x11::setGeometry_sys.
| | | * | Merge remote branch 'alien-on-cocoa/master' into alien-merged-mainlineRichard Moe Gustavsen2011-01-181-1/+6
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges alien feature branch with Qt master/mainline Conflicts: src/gui/kernel/qt_cocoa_helpers_mac.mm
| | | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Richard Moe Gustavsen2011-01-171182-3818/+9580
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | alien-squached Conflicts: src/gui/kernel/qcocoasharedwindowmethods_mac_p.h src/gui/kernel/qcocoaview_mac.mm src/gui/kernel/qwidget_mac.mm
| | | * | | | Alien implementation for the Cocoa portRichard Moe Gustavsen2011-01-1724-1283/+1641
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Give Alien on Cocoa a warm welcome.
| * | | | | | Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse ↵Qt Continuous Integration System2011-01-2729-152/+358
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (69 commits) Lighthouse: License headers to new files in testlite Make sure we blit the fbo on flush in QGLWindowSurface Lighthouse: Wayland. Make the wayland integration closer to Lighthosue Lighthouse: Wayland, only make one fbo for the WaylandPaintDevice Making clearer separation between responsibility of different classes Make it possible to vertically mirror gl painting Lighthouse:Wayland Moving some logic into files Fix Wayland plugin to work with Wayland after some interfaces changed Make QGLContext::fromPlatformGLContext show correct sharing Remove Lighthouse specific code from QGLWindowSurface Fix X11 clipboard bug. Fix for uninitialized member in QWaylandCursor wayland: use pkgconfig for libdrm in wayland.pro wayland: remove non-public header from config.tests wayland: fix SOURCES to point to wayland.cpp in config.tests Wayland: request rbg and premultiplied argb visuals as needed Wayland: clamp window resizes to screen size Wayland: split GL code into separate files Wayland: use correct viewport for swapBuffers and correct coords Wayland: fix geometry of swapBuffers ...
| | * \ \ \ \ \ Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-261151-1619/+1782
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Make QGLContext::fromPlatformGLContext show correct sharingJørgen Lind2011-01-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information. Prior to this, if a context was created with QGLWidget it would setup the sharing correct, but all sharing actually created on a QPlatformGLContext level was ignored by the QGLContext, thus indicating that it wasnt sharing with any other context.
| | * | | | | | Add Qt::Key_ScreenSaverPaul Olav Tvete2011-01-181-0/+1
| | | | | | | |
| | * | | | | | Lighthouse: Fix keyboard modifier handlingJørgen Lind2011-01-071-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QApplication allready knows the modifiers
| | * | | | | | Lighthouse: Support external plugins.Morten Johan Sørvig2011-01-073-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add -platformpluginpath command line option that spesifies an additional directory to scan for plugins. Also read QT_QPA_PLATFORM_PLUGIN_PATH. QlatformIntegrationFacgtory::create() now tries to load the plugin from the external path first. Similarly, keys() returns the keys from the extra path in addition to the "internal" keys API changes: QPlatformIntegration::create() and keys() now take an optional const QString &platformPluginPath. New file: externalplugin.pri, contains instructions and a base setup for building external plugins.
| | * | | | | | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-052-0/+4
| | |\ \ \ \ \ \
| | * | | | | | | Add styleHint to fallback api for fontdatabases in LighthouseJørgen Lind2011-01-044-7/+12
| | | | | | | | |
| | * | | | | | | Initial support for WS specific clipboard support in LighthouseJørgen Lind2011-01-047-74/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default implementation in QPlatformIntegration still supports in process copy/paste
| | * | | | | | | Add basic mouse context menues to lighthouseJørgen Lind2011-01-041-0/+8
| | | | | | | | |
| | * | | | | | | Fix nativechild widget position in LighthouseJørgen Lind2011-01-041-10/+6
| | | | | | | | |
| | * | | | | | | Dont do backingStore.destroy in deleteTLSysExtraJørgen Lind2011-01-041-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is done by QWidgetPrivate::deleteExtra()
| | * | | | | | | Handle the QWidgetPrivate::mapper structureJørgen Lind2011-01-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont have widgets without a valid winId there
| | * | | | | | | Add function QPlatformScreen::platformScreenForWidgetJørgen Lind2011-01-046-39/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This so there is some logical connection between what screen a widget belongs to
| | * | | | | | | Added window focus handling to lighthouseJørgen Lind2011-01-048-6/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea is that QPlatformWindows can request focus handling. And when actual focus shifting is done by windowsystem callbacks/events which are sent to QWindowSystemInterface
| * | | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-01-2714-59/+642
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (78 commits) Add util/xkbdatagen/README Application background is incorrect if app locked to landscape. QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap" Temporary fix for ambiguous cast from four letter char constant add autotest for digest authentication Fix cursor position adjustment when removing strings Fix QMAKE_POST_LINK in Symbian for targets with special characters. QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Improved performance of mapFromGlobal/mapToGlobal on X11 Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate Avoid possible font name collisions on fbserv Update of Czech translation for Qt 4.7-stable Fix crash in QtScript/JSC stack allocator on Symbian HTTP: fix digest authentication Fix loop count in animanted gifs sometimes being incorrect Fixed UTF-8 application names in device application menu in Symbian Validate arguments to QDBusConnection::connect make the test a bit stricter ignore the warning from auto-detach in destructor ...
| | * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-266-27/+70
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-01-261-0/+1
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add util/xkbdatagen/README
| | | | * | | | | | | Add util/xkbdatagen/READMEOlivier Goffart2011-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Joao
| | | * | | | | | | | Application background is incorrect if app locked to landscape.Sami Merila2011-01-261-4/+4
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If application orientation has been locked to landscape and application is started out while device orientation is portrait, QS60Style draws the QPalette::background like device would be in landscape. Style is incorrectly following device orientation, when it should follow application orientation. As a fix, style follows now application orientation. As a bonus, unnecessary fullscreen QPixmap creation is avoided when rotating the device. Task-number: QTBUG-16816 Reviewed-by: Jani Hautakangas
| | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-01-252-20/+60
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap" add autotest for digest authentication QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap Improved performance of mapFromGlobal/mapToGlobal on X11 Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
| | | | * | | | | | | Improved performance of mapFromGlobal/mapToGlobal on X11Denis Dzyubenko2011-01-251-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't call XTranslateCoordinates anymore, but use the toplevel window offset that we already store to convert between screen coordinates and widget coordinates. Reviewed-by: João Abecasis