summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-10-2338-466/+1045
|\
| * Compile fix for gestures on Windows.Denis Dzyubenko2009-10-221-4/+4
| | | | | | | | Reviewed-by: trustme
| * Compile fix.Denis Dzyubenko2009-10-221-4/+4
| | | | | | | | | | | | | | QPanGesture was changed to use QPointF instead of QSizeF, also need to change all usages of the pan gesture. Reviewed-by: trustme
| * QTextEdit: Fix the wrong order for call of Qt::WA_InputMethodEnabled in ↵Liang QI2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | setReadOnly. Should set Qt::WA_InputMethodEnabled after set the flags, just because shouldEnableInputMethod() will read the flags. Task-number: QTBUG-4917 Reviewed-by: Shane Kearns
| * Make warning more helpful.Thomas Zander2009-10-221-1/+1
| | | | | | | | Also fix grammer and avoid using combined words.
| * Change API; the pan gesture now has points for distance, not size.Thomas Zander2009-10-224-24/+24
| |
| * Make the already-public calls be documented and publicThomas Zander2009-10-222-3/+2
| |
| * Implemented gesture event delivery and propagation inside QGraphicsView.Denis Dzyubenko2009-10-222-18/+236
| | | | | | | | Reviewed-by: Thomas Zander
| * Added debug operator for QGraphicsObjectDenis Dzyubenko2009-10-222-0/+18
| | | | | | | | Reviewed-by: Alexis Menard
| * Add QGestureEvent::mapToScene for better graphicsView integrationThomas Zander2009-10-223-0/+24
| |
| * Fix for the gestures autotest.Denis Dzyubenko2009-10-221-1/+2
| | | | | | | | Reviewed-by: trustme
| * Improvements for gesture event deliveryDenis Dzyubenko2009-10-226-40/+92
| | | | | | | | | | | | | | | | | | When delivering GestureOverride events by default both the event and individual gestures will be ignored. We also store the acceptance state of individual gesture in the event and not in the gesture object, along with its target. Reviewed-by: Thomas Zander
| * Improving gesture event delivery for widgets.Denis Dzyubenko2009-10-224-81/+148
| | | | | | | | Reviewed-by: trustme
| * Fixed gesture event delivery when several gestures are triggered.Denis Dzyubenko2009-10-222-23/+20
| | | | | | | | | | | | | | | | When there are two different gestures are being triggered and they are supposed to be sent to different widgets, don't stop event "propagation" when the first event is successfully delivered. Reviewed-by: trustme
| * Improved gesture event filtering inside QGraphicsView for QGraphicObjectsDenis Dzyubenko2009-10-2211-129/+208
| | | | | | | | Reviewed-by: trustme
| * Merge branch 'origin/4.6' into widgets-team/4.6Olivier Goffart2009-10-2213-103/+100
| |\
| | * qfontengine_win.cpp: special Windows CE code removedJoerg Bornemann2009-10-221-75/+16
| | | | | | | | | | | | Reviewed-by: thartman
| | * Fix a bug in QGraphicsRotation related to 2D projectionsRhys Weatherley2009-10-222-2/+4
| | | | | | | | | | | | | | | | | | | | | The projection to 2D needs to be done when the rotation is applied, not after all transformations have been applied. Reviewed-by: trustme
| * | Fixed crash in tst_qabstractitemview.Gabriel de Dietrich2009-10-211-3/+11
| | | | | | | | | | | | Reviewed-by: trust-me
| * | The QMenuPrivate::activationRecursionGuard has to be a boolean.Marius Bugge Monsen2009-10-211-1/+1
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Make QMenu::activateCausedStack() exception safe.Marius Bugge Monsen2009-10-211-3/+11
| | | | | | | | | | | | | | | | | | Use an internal class to reset the activationRecursionGuard when the scope is closed. Reviewed-by: Leo Cunha
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Marius Bugge Monsen2009-10-2127-137/+601
| |\ \
| * | | 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
| | |\ \ \ \
| | * | | | | 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
| | |\ \ \ \ \
| | * | | | | | QToolButton popup menu is shown at wrong position when embedded in aAlexis Menard2009-10-208-32/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGraphicsView. The main problem here is that QWidget assume that they are in the screen somewhere, which means inside the available geometry provided by QDesktopWidget. But in QGraphicsView the button can be in a position that is way bigger than the screen resolution. Lot of widgets make this assumption when positionning subpopups or submenus. Instead of applying the same code on tons of QWidgets, it's better to have an helper function in desktop widget which catch this case. It's not pretty (since it has nothing to do with QDesktopWidget) but we don't have better solution. Task-number:QTBUG-3822 Reviewed-by:brad
| * | | | | | | Add some docs that explicitly mentions how we handle cycles in the treeJan-Arve Sæther2009-10-202-0/+5
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was reported for QGraphicsAnchorLayout, but affects all QGraphicsLayout subclasses. However, since it is not even handled properly in QGraphicsItem::setParentItem() it should be fine that we don't try to deal with this issue. Thus, the layouts are "consistent" with graphics items when it comes to detection of cycles in the tree.
* | | | | | | Added caching of graphics effect source pixmaps to speed up effects.Samuel Rødal2009-10-229-13/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an effect is applied repeatedly on the same source, just with varying parameters, we can save a lot by caching the source pixmaps. Reviewed-by: Bjørn Erik Nilsen
* | | | | | | Remove whitespace before license header in qbackingstore_p.hEskil Abrahamsen Blomfeldt2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extra whitespace was introduced by mistake in a previous commit. Remove it again. Reviewed-by: Trust me
* | | | | | | Remove debug outputEskil Abrahamsen Blomfeldt2009-10-221-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oops. Reviewed-by: Trust me
* | | | | | | Honor graphics system on Mac/Cocoa when exposing and resizing windowEskil Abrahamsen Blomfeldt2009-10-222-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When exposing or resizing a previously hidden window on Cocoa, we would go through the CoreGraphicsPaintEngine even when a different graphics system was set. This was because there were two different paths from the windowing system into our paint event. The one going through the virtual drawRect function in QCocoaView did not honor the graphics system. This patch makes sure the backing store is used for these types of events as well. Done with: Gunnar Reviewed-by: MortenS
* | | | | | | Fixed regression in translucent window creation on X11.Samuel Rødal2009-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When setting the TranslucentBackground flag after the window has been created, we should check whether the widget has a native window id, and not the WA_NativeWindow attribute which doesn't seem to be set by default for top-level widgets. Reviewed-by: Trond
* | | | | | | updated documentation for QPixmap::fromImage()Gunnar Sletta2009-10-221-5/+7
| | | | | | |
* | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-222-8/+17
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6Gunnar Sletta2009-10-224-4/+19
| |\ \ \ \ \ \
| | * | | | | | Improved QFontInfo::pointSize() slightly on X11.Kim Motoyoshi Kalland2009-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In non-GUI applications on X11, QFont and QFontInfo return different point size because for QFontInfo, the point size is converted to pixel size and back, but with different dpis. This commit improves the situation for the case where font config is used, but the bug still needs to be fixed properly by using the same dpi for all point<->pixel size conversions. Reviewed-by: Trond
| * | | | | | | Added doc warning about ARGB32 image drawing and fixed format docsGunnar Sletta2009-10-211-7/+16
| | | | | | | |