summaryrefslogtreecommitdiffstats
path: root/src/gui
Commit message (Collapse)AuthorAgeFilesLines
* Use qreal for QGraphicsOpacityEffect opacity property.Michael Brasser2009-09-041-1/+1
| | | | Reviewed-by: Yann Bodson
* Added description of visualIndex condition to docs for logicalIndex()Peter Yard2009-09-011-1/+3
| | | | Fix for task: 214373
* Disable event compression when the tablet events are acceptedBenjamin Poulain2009-08-311-53/+58
| | | | | | | | | | | | | | | | | | | | | | | | | Since Qt 4.5, all tablet events are compressed not to overload the widgets with the corresponding mouse event (a mouse event is generated if the tablet event is not accepted). This behavior reduce the precision when drawing on a widget that use the tablet events. All tablet events should be sent to the widget that are accepting the tablet event. With this patch, the tablet event are filtered only if the widget ignore the first tablet event. The mouse events are compressed. There is two special cases for the filtering: First, if a tablet event is for another widget than the one ignoring the tablet, this event should not be filtered. Second, if there is a mouse press event, the mouse move event should be sent to the widget that received the mouse press event. Helped-by: Pierre Rossi Reviewed-by: Thomas Zander Reviewed-by: Bradley T. Hughes
* Adapt to libpng 1.4.0beta74 API changeBernhard Rosenkraenzer2009-08-311-0/+4
| | | | | | | | | From libpng changelog: version 1.4.0beta74 [August 8, 2009] Changed png_ptr and info_ptr member "trans" to "trans_alpha". Merge-request: 1317 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* Qt fails to build with libpng 1.4 betasBernhard Rosenkraenzer2009-08-311-0/+4
| | | | | | | | Qt expects a trans_values member in png_info_struct; this member has been renamed to trans_color in libpng 1.4. Merge-request: 1317 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* fix doc. id maps to QObject::objectName, not QGraphicsObject::setOpacity ;-)Riccardo Iaconelli2009-08-311-1/+1
| | | | | | | Signed-off-by: Riccardo Iaconelli <riccardo@kde.org> Merge-request: 1371 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* Make QMargins a proper classJens Bache-Wiig2009-08-314-99/+98
| | | | | | | | | | Since we need QMargins for other things then the CSS helper functions in drawutil, we have to make it more generic. It is already useful for QWidget::contentsMargins for example. This ensures we have some flexibility on how to use and modify it in the future. Reviewed-by: mbm
* Add auto-activation on show/hide and setParentItem().Andreas Aardal Hanssen2009-08-313-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | If you show a child panel of an active panel, the child will now be activated and the parent deactivated. Hiding the child panel will reactive the parent. If the parent is 0, no other panel is activated. Reparenting a panel onto an active panel will also activate the (new) child. Reparenting away does not affect activation in any way. This change also fixes QGraphicsWidget::isActiveWindow(), which returned true for all toplevel widgets (not in a panel/window). This is wrong; either the non-panel items are active, or a panel is active. The correct behavior is the same as calling QGraphicsItem::isActive(). Fixed the autotests (which wrongly tested that both a panel and a non-panel item were active at the same time). This change causes popups (QGraphics{Proxy,}Widget) to deactivate the parent widget. On the positive side this activates the popup, and ensures that the parent regains proper focus when the popup is closed. However it also means the parent widget is inactive while the popup is open, which (e.g.) causes editable combobox line edit cursors to stop blinking. This is to be fixed soon, but the fix is a bit big so we'll do that later. Autotests included. Reviewed-by: Brad
* Fix activation behavior for panels, and add QGraphicsItem::setActive().Andreas Aardal Hanssen2009-08-315-61/+137
| | | | | | | | | Allow delayed activation for more fine grained control over which panels are activated or left inactive when the scene is created. Autotests included. Reviewed-by: Brad
* doc: Fixed several qdoc errors.Martin Smith2009-08-311-1/+1
|
* doc: Fixed several qdoc errors.Martin Smith2009-08-312-2/+4
|
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-31112-1456/+1456
| | | | Reviewed-by: Trust Me
* doc: Fixed several qdoc errors.Martin Smith2009-08-311-12/+48
|
* Fixed performance issue with graphics effects on graphics items.Samuel Rødal2009-08-311-0/+2
| | | | | | | Prevent a deep copy of the pixmap by ending the painter before returning the pixmap. Reviewed-by: Bjørn Erik Nilsen
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-31976-12688/+12688
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-31979-12727/+12727
| | | | | | | | Reviewed-by: Trust Me
| * Fixes: Crash when double-clicking a tab in a QTabBar with movable tabsOlivier Goffart2009-08-281-1/+2
| | | | | | | | | | | | This is a backport of commit 8ac7e81260 Reviewed-by: Peter Hartmann
* | doc: Fixed several qdoc errors.Martin Smith2009-08-314-13/+55
| |
* | Added QContextMenuEvent sending to widget in Symbian.Janne Anttila2009-08-311-1/+2
| | | | | | | | | | | | | | | | | | The event construction without sending does nothing, sending constructed event possibly dissappeared due to bad merge or something. So here it comes again... Task-number: 260222 Reviewed-by: TrustMe
* | Warning --Alessandro Portale2009-08-281-0/+2
| |
* | Added a default theme for the simulated S60 styleAlessandro Portale2009-08-284-3/+3
| | | | | | | | Reviewed-By: Trustme
* | Removing an obviously obsolete LIBS includion workaround.Alessandro Portale2009-08-281-2/+0
| | | | | | | | Reviewed-By: Trustme
* | Using QFocusFrame to visualize the focus.Alessandro Portale2009-08-283-118/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the keypad navigation, the focus state of a widget is supposed to be well visible. So it makes much sense to use QFocusFrame, which is able to paint a focus marker _around_ the widget. This change should fix the issue that with some S60 themes, the focus was invisible. Also, a lot of code is removed by this change. Task-number: 256470 Reviewed-by: Sami Merila modified: src/gui/styles/qs60style.cpp modified: src/gui/styles/qs60style.h modified: src/gui/styles/qs60style_p.h
* | Don't call qFuzzyIsNull on every single frame in QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-08-282-3/+10
| | | | | | | | | | We only have to do it when the opacity changes (in ::setOpacity). Also, we cannot do the cut-off when the effect has an opacity mask set.
* | Add support for setting an opacity mask on QGraphicsOpacityEffect.Bjørn Erik Nilsen2009-08-283-6/+96
| | | | | | | | | | | | | | | | Opacity masks enable you to make portions of an element transparent. More information about opacity masks here: http://msdn.microsoft.com/en-us/library/ms743320.aspx Reviewed-by: Samuel
* | Fix wrong transform when drawing graphics item effect source.Bjørn Erik Nilsen2009-08-281-4/+2
| | | | | | | | | | We are only interested in the difference between the original transform and the transform set on the painter we're about to use.
* | Re-enabled the QPixmap cleanup hooks in QPixmap destructor.Trond Kjernåsen2009-08-281-0/+2
| | | | | | | | Reviewed-by: Gunnar
* | Fixed runtime warning in tst_QGraphicsProxyWidget::childPos.Gabriel de Dietrich2009-08-281-2/+2
| | | | | | | | | | | | | | ungrabKeyboard was called on an item without checking whether it was a keyboard grabber. Reviewed-by: bnilsen
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-08-2816-44/+90
|\ \
| * | QTabBar: Add ability to change the position of the close button in the ↵Olivier Goffart2009-08-281-0/+12
| | | | | | | | | | | | | | | | | | | | | stylesheet Task-number: 241383 Reviewed-by: jbache
| * | QTabBar: Being able to change the close button appearence in the stylesheetOlivier Goffart2009-08-281-3/+11
| | | | | | | | | | | | | | | Reviewed-by: jbache Task-number: 241383
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6mread2009-08-286-12/+18
| |\ \
| | * | doc: Fixed several qdoc errors.Martin Smith2009-08-281-3/+0
| | | |
| | * | doc: Fixed several qdoc errors.Martin Smith2009-08-282-6/+5
| | | |
| | * | Fix the API for resetting QAbstractItemModels.Stephen Kelly2009-08-282-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit deprecates the QAIM::reset() method, and adds beginResetModel() and endResetModel() methods, addressing Qt issue 247023. http://www.qtsoftware.com/developer/task-tracker/index_html?method=entry&id=247023 If models and proxies use QAIM::reset() alone, then proxies will emit modelAboutToBeReset after its source model is reset. This means that mapToSource will not behave as expected (Will always return an invalid index) in a slot connected to modelAboutToBeReset. The usecase for this is maintaining viewstate (which items are selected, expanded) when the model is reset. See BrowserWidget::modelChanged here: http://websvn.kde.org/trunk/KDE/kdepim/akonadi/akonadiconsole/browserwidget.cpp?view=markup Task-number: 247023 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Merge-request: 1072
| | * | Fix crash in backingstore when QWidget::paintEngine() returns 0Prasanth Ullattil2009-08-281-2/+2
| | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | Deleting the CFontStore without a crashmread2009-08-283-5/+19
| |/ / | | | | | | | | | | | | | | | | | | CFontStore deletion crashes if there are any open fonts in it. These are now all deleted before the store is deleted. Reviewed-by: aportale
| * | doc: Change some uses of \reimp to \internal.Martin Smith2009-08-281-4/+0
| | |
| * | Merge branch 'inputPanelExample' into 4.6axis2009-08-281-8/+9
| |\ \
| | * | Doc: First review of the input panel example.David Boddie2009-08-281-8/+9
| | | |
| * | | Compile with Qt-in-a-namepsace.Morten Sørvig2009-08-284-12/+21
| | | |
* | | | Doc: Added some information about the clipping applied in paint events.David Boddie2009-08-281-1/+10
|/ / / | | | | | | | | | | | | Task-number: 203483 Reviewed-by: Trust Me
* | | Merge branch '4.6'Thiago Macieira2009-08-2775-491/+1012
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
| * \ \ Merge branch '4.5' into 4.6Thiago Macieira2009-08-271-3/+10
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result tests/auto/linguist/lupdate/testdata/good/lacksqobject/expectedoutput.txt tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/project.ts.result tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/project.ts.result tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp tests/auto/qcombobox/tst_qcombobox.cpp tests/auto/xmlpatternsview/view/FunctionSignaturesView.cpp tests/auto/xmlpatternsview/view/MainWindow.cpp tests/auto/xmlpatternsview/view/TestCaseView.cpp tests/auto/xmlpatternsview/view/TestResultView.cpp tests/auto/xmlpatternsview/view/TreeSortFilter.cpp tests/auto/xmlpatternsview/view/UserTestCase.cpp tests/auto/xmlpatternsview/view/XDTItemItem.cpp tests/auto/xmlpatternsview/view/main.cpp tests/auto/xmlpatternsxqts/lib/ASTItem.h tests/auto/xmlpatternsxqts/lib/DebugExpressionFactory.h tests/auto/xmlpatternsxqts/lib/ExpressionNamer.h tests/auto/xmlpatternsxqts/lib/ExternalSourceLoader.h tests/auto/xmlpatternsxqts/lib/Global.h tests/auto/xmlpatternsxqts/lib/ResultThreader.h tests/auto/xmlpatternsxqts/lib/TestBaseLine.h tests/auto/xmlpatternsxqts/lib/TestCase.h tests/auto/xmlpatternsxqts/lib/TestResult.h tests/auto/xmlpatternsxqts/lib/TestResultHandler.h tests/auto/xmlpatternsxqts/lib/TestSuiteHandler.h tests/auto/xmlpatternsxqts/lib/Worker.h tests/auto/xmlpatternsxqts/lib/XMLWriter.h tests/auto/xmlpatternsxqts/lib/XQTSTestCase.h
| | * | Fix subControlRect of the Mac style for the QComboBoxBenjamin Poulain2009-08-251-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The subControlRect of the arrow and the listBoxPopup where assuming the widget rect is at the origin. Reviewed-by: Richard Moe Gustavsen Reviewed-by: Pierre Rossi
| * | | QTabBar: Fix the position of button in tabs.Olivier Goffart2009-08-272-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the PM_TabBarTabHSpace instead of the hardcoded '6' Use a spacing of 4px instead of 2px between the buttons and the text. Reviewed-by: jbache
| * | | QTabBar: fix text being croped when there is an icon on the tabOlivier Goffart2009-08-272-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | By making sure the computation in QTabBar::tabSizeHint and QCommonStylePrivate::tabLayout are the same Reviewed-by: jbache
| * | | Refactor the way QCommonStyle layout the tabOlivier Goffart2009-08-272-81/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge all the code in a common layoutTab function This commit only moves the code around and doesn't change any behavour. The fixes for the broken layouts will go in another commit Reviewed-by: jbache
| * | | Doc: Explained how mouse events are handled by QGraphicsView.Geir Vattekar2009-08-271-3/+5
| | | | | | | | | | | | | | | | | | | | Task-number: 259924 Reviewed-by: Andreas Aardal Hanssen
| * | | Gestures: Implement swipe gestureRichard Moe Gustavsen2009-08-277-4/+171
| | | | | | | | | | | | | | | | Note: if this fails building on any platform, talk to Denis!