diff options
Diffstat (limited to 'debian/patches/0226-qtreeview-column_resize_when_needed.diff')
| -rw-r--r-- | debian/patches/0226-qtreeview-column_resize_when_needed.diff | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/debian/patches/0226-qtreeview-column_resize_when_needed.diff b/debian/patches/0226-qtreeview-column_resize_when_needed.diff index 180abec..e755a19 100644 --- a/debian/patches/0226-qtreeview-column_resize_when_needed.diff +++ b/debian/patches/0226-qtreeview-column_resize_when_needed.diff @@ -16,22 +16,26 @@ a This patch assures that if no header is shown, or if we only have one column (so no other columns become shrinked), the contents will be visible. ---- a/src/gui/itemviews/qtreeview.h -+++ b/src/gui/itemviews/qtreeview.h +Index: src/gui/itemviews/qtreeview.h +=================================================================== +--- a/src/gui/itemviews/qtreeview.h (revisión: 803370) ++++ b/src/gui/itemviews/qtreeview.h (copia de trabajo) @@ -229,6 +229,7 @@ Q_PRIVATE_SLOT(d_func(), void _q_columnsAboutToBeRemoved(const QModelIndex &, int, int)) Q_PRIVATE_SLOT(d_func(), void _q_columnsRemoved(const QModelIndex &, int, int)) Q_PRIVATE_SLOT(d_func(), void _q_modelAboutToBeReset()) + Q_PRIVATE_SLOT(d_func(), void _q_forceColumnResizeToFitContents()) }; - + #endif // QT_NO_TREEVIEW ---- a/src/gui/itemviews/qtreeview.cpp -+++ b/src/gui/itemviews/qtreeview.cpp +Index: src/gui/itemviews/qtreeview.cpp +=================================================================== +--- a/src/gui/itemviews/qtreeview.cpp (revisión: 803370) ++++ b/src/gui/itemviews/qtreeview.cpp (copia de trabajo) @@ -246,6 +246,19 @@ - + connect(d->model, SIGNAL(modelAboutToBeReset()), SLOT(_q_modelAboutToBeReset())); - + + // we connect these signals from the model to a slot that will call + // resizeColumnToContents. This is important because if we call it only on + // expand() method, when we expand a node, the filling of the model can be @@ -48,28 +52,28 @@ no other columns become shrinked), the contents will be visible. if (d->sortingEnabled) sortByColumn(header()->sortIndicatorSection()); } -@@ -2787,6 +2800,8 @@ +@@ -2797,6 +2810,8 @@ } if (model->canFetchMore(index)) model->fetchMore(index); + + _q_forceColumnResizeToFitContents(); } - + void QTreeViewPrivate::collapse(int item, bool emitSignal) -@@ -2826,6 +2841,8 @@ +@@ -2836,6 +2851,8 @@ else emit q->collapsed(modelIndex); } + + _q_forceColumnResizeToFitContents(); } - + void QTreeViewPrivate::prepareAnimatedOperation(int item, AnimatedOperation::Type type) -@@ -2937,6 +2954,25 @@ +@@ -2947,6 +2964,25 @@ viewItems.clear(); } - + +void QTreeViewPrivate::_q_forceColumnResizeToFitContents() +{ + Q_Q(QTreeView); @@ -92,13 +96,15 @@ no other columns become shrinked), the contents will be visible. void QTreeViewPrivate::_q_columnsAboutToBeRemoved(const QModelIndex &parent, int start, int end) { Q_UNUSED(parent); ---- a/src/gui/itemviews/qtreeview_p.h -+++ b/src/gui/itemviews/qtreeview_p.h +Index: src/gui/itemviews/qtreeview_p.h +=================================================================== +--- a/src/gui/itemviews/qtreeview_p.h (revision 803534) ++++ b/src/gui/itemviews/qtreeview_p.h (working copy) @@ -101,6 +101,7 @@ QPixmap after; }; - + + void _q_forceColumnResizeToFitContents(); void expand(int item, bool emitSignal); void collapse(int item, bool emitSignal); - + |