summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Check for QPixmap::isNull() in QPainter::drawPixmap()Gunnar Sletta2009-11-031-1/+1
| | | | Reviewed-by: Samuel
* Compile...Gunnar Sletta2009-11-031-2/+2
| | | | Reviewed-by: TrustMe
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-03125-1079/+2461
|\
| * fix font height calculation on QWSJoerg Bornemann2009-11-031-1/+1
| | | | | | | | | | | | | | fontDef.pixelSize is a qreal now and we should round it after multiplication to avoid an accuracy loss. Reviewed-by: mae
| * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-02122-1078/+2427
| |\
| | * Merge commit 'origin/4.6' into featureJørgen Lind2009-11-02118-1758/+2571
| | |\
| | | * Compilation error due to undefined EGL_BIND_TO_TEXTURE_RGB for OpenGLKeith Isdale2009-11-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ES enabled build of Qt for Windows CE Add #ifdef guards around EGL_BIND_TO_TEXTURE_RGB useage Task-number: QTBUG-5152 Reviewed-by: Trond Kjernåsen
| | | * Compilation failure QtOpenGL when Opengl ES is used on Qt for Windows CEKeith Isdale2009-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable building egl/qegl_wince.cpp when a wince* mkspec is used Add "egl" to QT_CONFIG when any of the OpenGL ES variants is used Task-number: QTBUG-5073 Reviewed-by: Trond Kjernåsen
| | | * Track declarative changesWarwick Allison2009-11-021-1/+1
| | | |
| | | * Merge commit '8c4edbd04f350294462fd689748de2dd7cc84d47' into 4.6-upstreamBradley T. Hughes2009-10-3037-294/+1053
| | | |\
| | | | * Fix tab widget painting in QGtkStyle with reverseJens Bache-Wiig2009-10-086-28/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds QStyleOptionTabWidgetFrameV2 so that we do not have to do ugly hacks in the style to obtain it. Task-number: QTBUG-5187 Reviewed-by: ogoffart
| | | | * Tabs with corner widgets are drawn incorrectly in document mode on Mac.Prasanth Ullattil2009-10-292-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While drawing the tabbar frame, mac style needs the QTabBar pointer to calculate the correct size. Since the QTabWidget also uses the PE_FrameTabBarBase to draw background of the corner widgets, the mac style has to use position passed with the style option. This only works with horizontal tabs. Reviewed-by: Jens Bache-Wiig
| | | | * Ensure that button returns 0 for mouse move eventsDean Dettman2009-10-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a platform regression for the cocoa platform Reviewed-by: Prasanth
| | | | * Fix a combobox autotest on VistaJens Bache-Wiig2009-10-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subcontrol rect offset was correctly reporting not to work on Vista style. The problem was that we were getting the size of the arrow by subtracting the xoffset. But this would mean that the Reviewed-by: ogoffart
| | | | * Fix split tool button drawing on Vista when not in a tool barJens Bache-Wiig2009-10-071-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a tool button is not in a tool bar on XP and Vista it will get a slightly different appearance from normal tool buttons. I resolved this by drawing a normal tool button with a divider line on top if the autoraise property is not set on the button. (which is by default enabled only for buttons in a tool bar). Task-number: QTBUG-5061 Reviewed-by: prasanth
| | | | * Wrong font used when moving a tab in document mode.Prasanth Ullattil2009-10-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dragging is handled by a seperate window in document mode. The currently selected tabbar item is drawn to a pixmap for this purpose. That paintdevice was not initialized correctly. (e.g. font) Reviewed-by: Trond
| | | | * Replaced QMap with QHash where possible in the gesture manager implementation.Denis Dzyubenko2009-10-282-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason to use QMap when the key is a pointer. Reviewed-by: Thomas Zander
| | | | * Tiny doc change by David Boddie.Denis Dzyubenko2009-10-281-3/+3
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | | | * Delete all gesture objects and recognizers when gesture manager is deleted.Denis Dzyubenko2009-10-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When application closes and we haven't deleted the unregistered gestures and gesture recognizer, we should delete them. Reviewed-by: Thomas Zander
| | | | * Fixed the gesture event filtering through multiple gesture recognizers.Denis Dzyubenko2009-10-282-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are several gesture recognizers registered for the same gesture type, we need to know which recognizer we need to get a state object for since those QGesture objects are tied to the recognizer that created them. Reviewed-by: Thomas Zander
| | | | * Removed obsolete private field from the QGesture and fixed the doc.Denis Dzyubenko2009-10-283-11/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thomas Zander
| | | | * Mark the QGestureEvent::setWidget as internalThomas Zander2009-10-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The widget() getter is still publicly documented, follow the lead of other events to make the setter internal.
| | | | * Make the un/registerGestureRecognizer methods staticThomas Zander2009-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | As QApplication is a singleton this makes usage of these easier and also in line with many other methods on the class.
| | | | * Rename private member variables to begin with m_Thomas Zander2009-10-282-67/+66
| | | | | | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| | | | * Drag and drop of plain text doesnot work on Mac.Prasanth Ullattil2009-10-283-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While querying for the text in the pasteboard, it was looking in the wrong place. The helper function qt_mac_get_pasteboardString() always searched in generalPasteboard instead of the pasteboard referred by the QMacPasteboard. Reviewed-by: MortenS
| | | | * Introduce QGesture::GestureCancelPolicy, a way to auto-cancel gesturesThomas Zander2009-10-285-7/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On accepting one gesture Qt can automatically cancel other gestures that belong to other targets. The policy is normally set to not cancel any other gestures and can be set to cancel all active gestures in the context. For example for all child widgets. Reviewed-By: Denis Dzyubenko
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-platform-team into ↵Bradley T. Hughes2009-10-2820-134/+609
| | | | |\ | | | | | | | | | | | | | | | | | | 4.6-WM_NULL-driven
| | | | | * Emit workAreaResized() in X11 when it changesGustavo Pichorim Boiko2009-10-272-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Emit the QDesktopWidget::workAreaResized() signal when the _NET_WORKAREA property of the root window changes. Merge-request: 1111 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | | | | * Fill gap of X.org/XFree multimedia/special/launcher keysHelio Chissini de Castro2009-10-272-91/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt up to 4.5.x is missing whole setup of multimedia keys already defined by X Merge-request: 1742 Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| | | | | * Renamed QGestureRecognizer::ResultFlags to ResultFlagDenis Dzyubenko2009-10-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decided after review by David Boddie. Reviewed-by: trustme
| | | | | * Implemented QGestureRecognizer::ConsumeEventHintDenis Dzyubenko2009-10-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: trustme
| | | | | * Selected tab is drawn incorrectly on Snow Leopard.Prasanth Ullattil2009-10-271-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default height of tab bar is 22 pixels in Snow Leopard. We used to draw tabs taller than 21 pixels to a pixmap and stretch to the required size. The limit is now changed to 22 pixels (which is the most common use case). The stretched drawing is not perfect in Snow Leopard due to some changes in how HITheme draws tabs. Reviewed-by: Jens Bache-Wiig
| | | | | * QTabbar is not behaving (painting) like native ones on Mac.Prasanth Ullattil2009-10-272-3/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a tab is clicked and mouse is moved outside that tab, it should be drawn as normal (not in sunken state). Reviewed-by: MortenS
| | | | | * Removed the obsolete documentation reference from the QGesture.Denis Dzyubenko2009-10-261-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | | * Fix the debug output to be correct again after refactoringThomas Zander2009-10-261-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | | | | * Fix memory leaks in the gesture managerThomas Zander2009-10-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | | | | * Add QWidget::ungrabGestureThomas Zander2009-10-264-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | | | | * Implement QApplication::unregisterGestureRecognizerThomas Zander2009-10-263-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Denis Dzyubenko
| | | | | * Added convenience functions QGestureEvent::setAccepted with a gestureDenis Dzyubenko2009-10-262-5/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | type argument. Reviewed-by: Thomas Zander
| | | | | * Implemented QGestureEvent::activeGestures and canceledGestures.Denis Dzyubenko2009-10-261-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thomas Zander
| | | | | * Optimisation for filtering events for gestures in graphics view.Denis Dzyubenko2009-10-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't add several graphicsobject contexts for the same gesture type when looking for the gesture-enabled QGraphicsObject under a hotspot. Reviewed-by: Thomas Zander
| | | | | * Merge branch '4.6' into 4.6-platformDenis Dzyubenko2009-10-2684-654/+1559
| | | | | |\
| | | | | * | Remove internal widgets from QApplication::topLevelWidgets()Prasanth Ullattil2009-10-234-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have some internal hidden widgets which should not come up in the QApplication::topLevelWidgets() list. So the known ones are being removed from the QWidgetPrivate::allWidgets set. Task-number: QTBUG-739 Reviewed-by: Denis Dzyubenko Reviewed-by: Bradley T. Hughes
| | | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-drivenBradley T. Hughes2009-10-28100-698/+1697
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-drivenBradley T. Hughes2009-10-221-75/+16
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-drivenBradley T. Hughes2009-10-2212-28/+84
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-drivenBradley T. Hughes2009-10-2124-120/+541
| | | | |\ \ \ \ \
| | | | * | | | | | Remove workarounds for Win32 event dispatcher bugsBradley T. Hughes2009-10-204-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes the startstop timer delay in QAbstractAnimation, and the inSizeMove workaround for paint events. Reviewed-by: Prasanth Ullattil
| | | * | | | | | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-10-3036-956/+515
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into origin-4.6Olivier Goffart2009-10-309-223/+224
| | | | |\ \ \ \ \ \ \