summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
Commit message (Collapse)AuthorAgeFilesLines
* Doc: fix typo.Volker Hilsheimer2009-11-131-1/+1
| | | | Fixes: QTBUG-5146
* Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-1/+1
|\
| * API review: Rename functions numColors(), setNumColors() and numBytes()Marius Storm-Olsen2009-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | QPaintDevice and QImage used the functions numColors(), setNumColors(), and numBytes(). However, this is not consistent with the rest of the Qt API which uses *Count() and set*Count(). Removed all usage of these functions inside Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
* | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-051-0/+1
|\ \ | |/
| * Merge branch '4.6-s60' into 4.6axis2009-11-041-0/+1
| |\
| | * Fixed compile error on Symbian emulator.axis2009-11-031-0/+1
| | | | | | | | | | | | RevBy: Trust me
* | | Result API review with JasminThierry Bastian2009-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAbstractAnimation: currentTime returns the "complete" current time currentLoopTime() returns the time inside the current loop add setPaused(bool) for consistency with QTimeLine stateChanged: newState passed as first paramater (before oldState) for consistency with the reset of Qt QAnimationGroup: rename clearAnimations to clear rename insertAnimationAt to insertAnimation rename takeAnimationAt to takeAnimation QSequentialAnimationGroup: rename insertPauseAt to insertPause
* | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-042-13/+13
|\ \ \ | |/ /
| * | QGtkStyle refactoringRobert Griebl2009-11-031-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QGtk class has been refactored into a private d class for QGtkStyle. This allows us to re-use a lot of code for the Maemo5 style without changing a single line in QGtkStyle itself plus we can easily add virtual functions where the two styles need to behave different. There shouldn't be any new functionality added (or old functionality lost) by this commit. Reviewed-By: jbache Reviewed-By: Ralf Engels
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-031-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
| | * Doc/i18n: Fixed source strings for translation.David Boddie2009-11-031-1/+1
| | | | | | | | | | | | Reviewed-by: Oswald Buddenhagen
* | | Fixed spacing display in QListView with wrapped text.Gabriel de Dietrich2009-11-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | The spacing was not being substracted from the viewport width when calculating the available space for items. Auto-test included. Reviewed-by: Olivier Task-number: QTBUG-2678
* | | QTreeView navigation now inverts left and right in RTLThierry Bastian2009-10-301-0/+6
|/ / | | | | | | | | Task-number: QTBUG-5007 Reviewed-by: ogoffart
* | QTreeView: fix drawing branches of model that adds or remove rows dynamicallyOlivier Goffart2009-10-302-4/+37
| | | | | | | | | | | | | | | | The lasts commits in the treeview did put the flags weither item has child or is the last in cache in the viewItem vector. But the cache was not updated while the model is modified. Reviewed-by: Thierry
* | QItemSelectionModel could emit selectionChanged with no changeThierry Bastian2009-10-301-1/+2
| | | | | | | | | | Task-number: QTBUG-560 Reviewed-by: ogoffart
* | In ItemViews, right click on the viewport clear the ext selectionThierry Bastian2009-10-301-1/+1
| | | | | | | | | | Task-number: QTBUG-435 Reviewed-by: Gabriel
* | QListView: make sure we relayout items when data changes in the modelThierry Bastian2009-10-292-1/+8
| | | | | | | | | | Task-number: QTBUG-633 Reviewed-by: ogoffart
* | ItemViews: make the geometries update when header data changesThierry Bastian2009-10-293-0/+6
| | | | | | | | | | | | | | autotest included Task-number: QT-711 Reviewed-by: ogoffart
* | Compile with -no-qt3supportAaron Kennedy2009-10-291-2/+2
| | | | | | | | Reviewed-by: andreas
* | Fixed bug in QTableView spans.Gabriel de Dietrich2009-10-282-2/+47
| | | | | | | | | | | | | | | | In some cases, the spans internal structure was left in an inconsistent state. Auto-test included. Bonus: spans consistency checking method. Task-number: QTBUG-5062 Reviewed-by: Olivier
* | Fixed missing repaints on QTreeView when moving the mouseThierry Bastian2009-10-281-2/+6
| | | | | | | | | | | | | | ..from the decoration to the item itself. QAbstractItemView can't handle that because it doesn't know anything about decoration. Reviewed-by: gabi
* | Merge branch 'fixes' of ↵Jan-Arve Sæther2009-10-281-1/+1
|\ \ | |/ | | | | | | | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into openbossa-fleury-fixes3 Conflicts: src/gui/graphicsview/qgraphicsanchorlayout_p.cpp src/gui/graphicsview/qgraphicsanchorlayout_p.h
| * Line spacing fixesJoerg Bornemann2009-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTextEdit (via QTextLayout) and QPlainTextEdit in Qt used to ignore any font leading but added one extra pixel in QFontMetrics. With many freetype fonts, this resulted in a "spacy" text layout. The necessary fixes on X11 and Windows were to take (positive) leading into account, to make the font database convert point sizes to pixel sizes without rounding to plain integer values, and to subtract the extra pixel from QFontMetrics from the font engines' descent value. The change also fixes several places in styles and widgets, where QFontMetrics::lineSpacing() was wrongly used instead of QFontMetrics::height(). Ideally we should also handle negative leading, which would require additional and bigger code changes in QTextLayout and QPlainTextEdit. In addition, all other editors we have tested seem to ignore leading on X11. If we choose to believe the values provided by freetype, our text layout would be one pixel smaller than everybody else's. On the Mac, this change does nothing. There our layout is still too spacy, and for smaller fonts quite ugly compared to native Mac applications. Done with mae. Reviewed-by: mae
* | Fix incomplete documentation for Qt::DecorationRoleDavid Faure2009-10-272-2/+2
| | | | | | | | | | | | | | As noticed by Laurent Montel. Merge-request: 1812 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | Fixed QTreeView not emitting doubleCliked when 1st col is spannedThierry Bastian2009-10-271-3/+1
| | | | | | | | | | Task-number: QTBUG-976 Reviewed-by: ogoffart
* | QTreeView: Make sure the state QStyle::State_Sibling is correctly setOlivier Goffart2009-10-272-10/+10
| | | | | | | | | | | | | | | | That state used not to be set for drawing the content of the items. Also, it could be wrong for branches if there was hidden items. Reviewed-by: Thierry Task-number: related to 234930
* | Fixes QTreeView: stylesheet :has-children pseudo selector doesn't works for ↵Olivier Goffart2009-10-272-13/+18
| | | | | | | | | | | | | | | | | | | | | | the ::item pseudo-class The State_Children was not set on the QStyleOption. Refactorized a little bit the way it was computed. Reviewed-by: Thierry Task-number: 234930 Task-number: QTBUG-3129
* | QTableView would not correctly resize to contentsThierry Bastian2009-10-272-0/+6
| | | | | | | | | | | | | | | | The problem was that we didn't call ensurePolished when getting the size of the sections. Task-number: QTBUG-1002 Reviewed-by: ogoffart
* | Fixed typoGabriel de Dietrich2009-10-261-1/+1
| | | | | | | | | | | | | | Would not have introduced any bug as invald QModelIndex are currently initialised with -1 for row and column. Reviewed-by: trust me
* | Drag and drop in QListWidget would not preserve the selectionGabriel de Dietrich2009-10-262-13/+21
| | | | | | | | | | | | | | | | | | | | Now, when dropping items, these will remain selected, and in the same visual order as when dragged. Auto-test included for the items moving part. For the rest, it's a drag-and-drop thing. Reviewed-by: Olivier
* | Added visual DnD indicator for left to right flow in QListViewGabriel de Dietrich2009-10-234-3/+119
|/ | | | | | | | | | | | Extended the behaviour already present in QAbstractItemView into QListView. This means some code duplication which should maybe be refactored at some point. (Seems to be the price to pay when some delegate does almost the same thing as the base class). No auto-test, as it's a drag-and-drop related task. Reviewed-by: Thierry Task-number: QTBUG-3730
* Fixed crash in tst_qabstractitemview.Gabriel de Dietrich2009-10-211-3/+11
| | | | Reviewed-by: trust-me
* 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
* 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
* 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-widget-team into 4.6Alexis Menard2009-10-202-4/+4
|\
| * Fix a bug affecting keyboard navigation in the table viewOrgad Shaneh2009-10-191-2/+2
| | | | | | | | | | Reviewed-by: thierry Reviewed-by: pierre
| * Fixed typo in qtableview.cpp.Gabriel de Dietrich2009-10-161-1/+1
| | | | | | | | | | | | Auto-test included. Will timeout on fail. Reviewed-by: Alexis
| * Fixed updating problems QListView with IconModeGabriel de Dietrich2009-10-151-1/+1
| | | | | | | | | | | | | | The updated rectangle coordinates didn't use the viewport offsets. Reviewed-by: Olivier Task-number: QTBUG-4819
* | Merge commit 'origin/4.5' into origin/4.6Olivier Goffart2009-10-151-1/+1
|\ \ | |/ |/| | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac.mm src/network/access/qhttpnetworkconnection.cpp src/opengl/qgl_qws.cpp src/opengl/qglpixelbuffer_egl.cpp
| * 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
* | Make the autotest pass for descending order in QTableWidgetPierre Rossi2009-10-142-2/+2
| | | | | | | | | | | | | | It failed after this commit: 19030e2af098e319e3c3f3883c51e28364bf3ccf Reviewed-by: ogoffart
* | Sorting bug in QTableView fixPierre Rossi2009-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | When the DisplayRole is identical for two or more items, any modification of one item (e.g. backgroundColorRole) may trigger a re-ordering, which is obviously not an behaviour to be expected. Same fix as the one used for QTreewidget in c9eacfa1c791e2d228a3c8f0c119d02d7f46ee02. Task-number: QTBUG-4856 Task-number: 262056 Reviewed-by: Olivier Goffart
* | Fix sorting after changing a QTableView's headerOlivier Goffart2009-10-131-0/+3
| | | | | | | | | | | | | | | | | | Keep the sorting states in sync with the header when setting custom headers Reviewed-by: Gabriel Task-number: QTBUG-3128 task-number: 234926
* | Itemview: fix regression concerning Ctrl+rubber band selectionsFrank Reininghaus2009-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When making a rubber band selection while Control is pressed in an itemview with extended selection, make sure that the selection state of the items inside the rubber band is toggled. This ammend commit 0644e3dce532b1df00a77d3a30c61d6b75d3ff30 Merge-request: 1759 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> Reviewed-by: Gabriel Task-number: QTBUG-1435 Task-number: 191545
* | Merge commit '8df79a473e1a7e5c79b9b10827985bf3e9501002' into 4.6Alexis Menard2009-10-121-3/+1
|\ \
| * | Revert merge commit 3945fd75a93d790434b33c2d23aOlivier Goffart2009-10-121-1/+1
| | | | | | | | | | | | | | | The resolution of conflicts introduced regressions. And the commit was already in 4.6
| * | Fixed compilation warning by removing unused variables.Denis Dzyubenko2009-10-091-2/+0
| | | | | | | | | | | | Reviewed-by: trustme
* | | Fixed keyboard navigation for QTableViewGabriel de Dietrich2009-10-123-71/+140
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Keyboard navigation didn't work in the following cases: - The last column was disabled and we pressed the tab key when at the 2nd last column. (See ref. task). - Spans with their anchor column or row hidden or disabled. - Navigation would not preserve the original row/column when traversing a span horizontally/vertically. Auto-tests submitted with this commit. Task-number: QTBUG-3878 Reviewed-by: Olivier