summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Clips color interpolation to range [0, 255]Leonardo Sobral Cunha2009-10-211-4/+4
| | | | | | | This avoid warnings when using easing curves that progress outside the range [0.0, 1.0]. Patch proposed by warwick. Reviewed-by: Warwick Allison
* Merge branch 'qgal-api' into 4.6Jan-Arve Sæther2009-10-212-7/+18
|\
| * Group the spacing functions together, and add a sizePolicy property.Jan-Arve Sæther2009-10-212-7/+18
| | | | | | | | Improve the documentation for size policy.
* | Optimization in qt_closestItemFirst private functionLeonardo Sobral Cunha2009-10-201-11/+10
| | | | | | | | | | | | | | No need to traverse the tree again to access the topLevelItem in case there is no common ancestor. Reviewed-by: bnilsen
* | Moved private function to test which graphic items is in front of the otherLeonardo Sobral Cunha2009-10-204-70/+70
| | | | | | | | | | | | | | This function is moved to graphicsitem private because it is needed by multi-touch event handling and is not specific to bsptreeindex. Reviewed-by: bnilsen
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-201-6/+6
|\ \
| * | Extended commit 6c1388ee for LeftToRight flowGabriel de Dietrich2009-10-201-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Auto-test updated. As a bonus, stabilized tst_QListView::task262152_setModelColumnNavigate. Reviewed-by: Thierry
* | | Merge branch 'qlayout-make_adjustSize_better' into 4.6Jan-Arve Sæther2009-10-201-0/+4
|\ \ \ | |/ / |/| |
| * | Make adjustSize work even if there is a pending LayoutRequest event.Jan-Arve Sæther2009-10-201-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original report was that the customer did resize(main.sizeHint()) instead of the main.adjustSize(); Note that resize(main.sizeHint() still does not work. However, calling main.adjustSize() should now do what the original reporter wanted. The problem was that the resize did not work, because at the point of the resize the minimumHeight of main was still 22 (8+6+8), and we tried to resize it with a new height of 10. The resize would bound the height up to 22, and the main widget would then get a size of (200x22). The reason why it still had a minimumHeight of 22 was that it was the minimumSize of the previous layout configuration. Unfortunately the new minimumSize of the widget hadn't been updated yet because there was a LayoutRequest event in the queue that hadn't been processed yet. (This LayoutRequest was triggered by that we called invalidate() from hide()). Thus, processing the event queue immediately after the hide() could also have been a workaround for this issue. There is no really good fix for this issue (and it does not seem to be a common problem) without introducing a risk for regressions. Due to that we therefore decided to provide a fix in QWidget::adjustSize(). Reviewed-by: paul
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-10-2068-403/+1117
|\ \
| * | fix for QTreeView to not animate if there are no visible childrenThierry Bastian2009-10-201-4/+6
| | |
| * | Fixed QTreeView trying to animate when parent item has no childThierry Bastian2009-10-201-3/+3
| | | | | | | | | | | | | | | | | | We now check that the item has children before animating. Reviewed-by: Alexis
| * | Fix bug in embedded dialog demo with tab focus.Alexis Menard2009-10-202-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On embedded dialog pressing tab stop changing the focus when the focus was given to QFontComboBox. It's because QFontComboBox embed a QLineEdit in order to allow editing. But this QLineEdit is a focus proxy so we need to special case that. The logic is the same in QApplication. Be careful when changing one of them. Task-number:QTBUG-4818 Reviewed-by:jan-arve Reviewed-by:ogoffart
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-201-16/+4
| |\ \
| | * | Revert "Change the way we handle KeyboardUIMode on Mac"Benjamin Poulain2009-10-201-16/+4
| | | | | | | | | | | | | | | | | | | | | | | | This will be handled differently (QTBUG-4751) This reverts commit b12fb5861ce09539c04cd51db12a9bfbe32a4774.
| * | | Fixed wrong scrolling in QListView with hidden rows in ListModeGabriel de Dietrich2009-10-202-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The flow positions in ScrollPerItem mode did not take the hidden rows into account when configuring the vertical scroll bar. A mapping between the scroll bar value and the flow position has been added. Auto-test included. Task-number: QTBUG-2233 Reviewed-by: Thierry
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Alexis Menard2009-10-2058-338/+918
| |\ \ \ | | |/ /
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Alexis Menard2009-10-209-412/+533
| | |\ \
| | * | | Cocoa: modal window reappears on screen after reactivating appRichard Moe Gustavsen2009-10-201-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you close a modal window, then activate different app, then activate app again, the window will pop non-modal in front. This patch makes sure that when we hide a window, we point to the next window to receive keyboard focus. Rev-By: MortenS
| | * | | Fix bug QTBUG-4848Sarah Smith2009-10-202-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the shapeText function return numGlyphs properly - its not always the same as length of string. Task-number: QTBUG-4848 Reviewed-by: Rhys Weatherley
| | * | | fix widget activation from minimized state on Windows mobileJoerg Bornemann2009-10-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following didn't work on Windows mobile: * show a widget normal (non-maximized) * minimize it * reactivate it via the file explorer * now the widget should be visible again The code path from minimized to normal state was missing. Reviewed-by: thartman
| | * | | qwidget_wince.cpp: don't invalidate the crect on maximizeJoerg Bornemann2009-10-191-14/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we do this, QWidget::width() returns negative sizes, which makes QGraphicsView crash. Reviewed-by: thartman
| | * | | qwindowsmobilestyle.cpp: endif comment fixedJoerg Bornemann2009-10-191-1/+1
| | | | |
| | * | | Fix doc error.Jason Barron2009-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should *not* be used as a softkey. Reviewed-by: TrustMe
| | * | | Fixed QWidget::raise in SymbianMiikka Heikkinen2009-10-191-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If toplevel window is raised, the whole application is now raised to foreground. Task-number: QT-2162 Reviewed-by: axis
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-1952-293/+826
| | |\ \ \
| | | * | | Fix crash in QPixmapCache.David Faure2009-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCache destruction accesses the key array that was freed in the QPixmapCache destruction, so better clear() before deleting that key. Merge-request: 1820 Reviewed-by: Alexis Menard <alexis.menard@nokia.com>
| | | * | | Made Mac Carbon use the input method hints when deciding on IM.axis2009-10-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-1982-1630/+3317
| | | |\ \ \
| | | | * | | Doc: Documentation for gesture features. Still a moving target.David Boddie2009-10-164-4/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | | Doc: Gesture API documentation review and improvements.David Boddie2009-10-162-12/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Sami Merilä2009-10-161-1/+1
| | | | |\ \ \
| | | | | * | | doc: Corrected typo.Martin Smith2009-10-161-1/+1
| | | | | | | |
| | | | * | | | Softkeys remain disabled if action owning action widget is enabledSami Merilä2009-10-165-13/+13
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys have a QAction that is related to some action widget. The initial state of the action was set according the state of action widget (enabled/disabled). Now, if action widget's state changes, the softkey's action remain in the initial state. This was fixed by removing the enable/disable from the QAction and instead use the real state of action widget when handling the command of softkey. Task-number: QTBUG-4619 Reviewed-by: Janne Anttila
| | | | * | | doc: Fixed the wording in some \brief commands.Martin Smith2009-10-162-2/+2
| | | | | | |
| | | | * | | Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-1611-77/+128
| | | | |\ \ \
| | | | | * | | Recognize transformed screens when looking for a QGLScreenRhys Weatherley2009-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QWS_DISPLAY is specified as "Transformed:powervr:...", then we will encounter QScreen::TransformedClass rather than QScreen::ProxyClass when searching for the QGLScreen. This change makes the code search for both. Task-number: QT-2261 Reviewed-by: Sarah Smith
| | | | | * | | Use the fallback icon theme name, if the system icon theme name can not be ↵Robert Griebl2009-10-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | determined. This restores the behavior from before the the gui plugin merge. Reviewed-by: Olivier Goffart
| | | | | * | | Make QT_DIRECTFB_SUBSURFACE an opt-in optionAnders Bakken2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously you had to define QT_NO_DIRECTFB_SUBSURFACE to prevent Qt from using subsurfaces for locked surfaces. Now make the default be QT_NO_DIRECTFB_SUBSURFACE and rather allow people to define QT_DIRECTFB_SUBSURFACE to use this option. Reviewed-by: Donald Carr <donald.carr@nokia.com>
| | | | | * | | Fix themed icon loader on DEs other than KDE and Gnome.Robert Griebl2009-10-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we at least try to load an icon via the "hicolor" theme. Reviewed-by: Olivier Goffart
| | | | | * | | 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
| | | | | |\ \ \ \
| | | | | * | | | | 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
| | | | | | | | | |
| | | | * | | | | | Merge commit 'origin/4.6' into mmfphononFrans Englich2009-10-1596-1732/+3030
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/kernel/qcoreevent.h
| | | | | * | | | | Compile on Carbon.Morten Johan Sørvig2009-10-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ifdef out QCocoaPrintPanelDelegate.