KCategorizedView(parent),
m_controller(controller),
m_categoryDrawer(0),
+ m_font(),
+ m_decorationSize(),
+ m_decorationPosition(QStyleOptionViewItem::Top),
+ m_displayAlignment(Qt::AlignHCenter),
m_itemSize(),
m_dragging(false),
m_dropRect()
const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
Q_ASSERT(settings != 0);
- m_viewOptions = KCategorizedView::viewOptions();
- m_viewOptions.showDecorationSelected = true;
-
- QFont font(settings->fontFamily(), settings->fontSize());
- font.setItalic(settings->italicFont());
- font.setBold(settings->boldFont());
- m_viewOptions.font = font;
+ m_font = QFont(settings->fontFamily(), settings->fontSize());
+ m_font.setItalic(settings->italicFont());
+ m_font.setBold(settings->boldFont());
setWordWrap(settings->numberOfTextlines() > 1);
updateGridSize(view->showPreview(), 0);
if (settings->arrangement() == QListView::TopToBottom) {
setFlow(QListView::LeftToRight);
- m_viewOptions.decorationPosition = QStyleOptionViewItem::Top;
+ m_decorationPosition = QStyleOptionViewItem::Top;
+ m_displayAlignment = Qt::AlignHCenter;
} else {
setFlow(QListView::TopToBottom);
- m_viewOptions.decorationPosition = QStyleOptionViewItem::Left;
- m_viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
+ m_decorationPosition = QStyleOptionViewItem::Left;
+ m_displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
}
m_categoryDrawer = new DolphinCategoryDrawer();
const bool leftToRightFlow = (flow() == QListView::LeftToRight);
QRect itemRect = KCategorizedView::visualRect(index);
+
const int maxWidth = m_itemSize.width();
const int maxHeight = m_itemSize.height();
itemRect.setHeight(maxHeight);
}
- if (leftToRightFlow && bypassVisualRectIssue()) {
- // TODO: check inline comment inside bypassVisualRectIssue() for details
+ KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast<KCategorizedSortFilterProxyModel*>(model());
+ if (leftToRightFlow && !proxyModel->isCategorizedModel()) {
+ // TODO: QListView::visualRect() calculates a wrong position of the items under
+ // certain circumstances (e. g. if the text is too long). This issue is bypassed
+ // by the following code (I'll try create a patch for Qt but as Dolphin must also work with
+ // Qt 4.3.0 this workaround must get applied at least for KDE 4.0).
const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
const int margin = settings->gridSpacing();
const int gridWidth = gridSize().width();
const int gridIndex = (itemRect.left() - margin + 1) / gridWidth;
- itemRect.moveLeft(gridIndex * gridWidth + margin);
+ const int centerInc = (maxWidth - itemRect.width()) / 2;
+ itemRect.moveLeft((gridIndex * gridWidth) + margin + centerInc);
}
return itemRect;
QStyleOptionViewItem DolphinIconsView::viewOptions() const
{
- return m_viewOptions;
+ QStyleOptionViewItem viewOptions = KCategorizedView::viewOptions();
+ viewOptions.font = m_font;
+ viewOptions.decorationPosition = m_decorationPosition;
+ viewOptions.decorationSize = m_decorationSize;
+ viewOptions.displayAlignment = m_displayAlignment;
+ viewOptions.showDecorationSelected = true;
+ return viewOptions;
}
void DolphinIconsView::contextMenuEvent(QContextMenuEvent* event)
void DolphinIconsView::startDrag(Qt::DropActions supportedActions)
{
- if (bypassVisualRectIssue()) {
- // TODO: check inline comment inside bypassVisualRectIssue() for details
- DragAndDropHelper::startDrag(this, supportedActions);
- } else {
- KCategorizedView::startDrag(supportedActions);
- }
+ // TODO: invoking KCategorizedView::startDrag() should not be necessary, we'll
+ // fix this in KDE 4.1
+ KCategorizedView::startDrag(supportedActions);
+ DragAndDropHelper::startDrag(this, supportedActions);
}
void DolphinIconsView::dragEnterEvent(QDragEnterEvent* event)
void DolphinIconsView::dragLeaveEvent(QDragLeaveEvent* event)
{
- if (bypassVisualRectIssue()) {
- // TODO: check inline comment inside bypassVisualRectIssue() for details
- QAbstractItemView::dragLeaveEvent(event);
- } else {
- KCategorizedView::dragLeaveEvent(event);
- }
+ KCategorizedView::dragLeaveEvent(event);
// TODO: remove this code when the issue #160611 is solved in Qt 4.4
m_dragging = false;
void DolphinIconsView::dragMoveEvent(QDragMoveEvent* event)
{
- if (bypassVisualRectIssue()) {
- // TODO: check inline comment inside bypassVisualRectIssue() for details
- QAbstractItemView::dragMoveEvent(event);
- } else {
- KCategorizedView::dragMoveEvent(event);
- }
+ KCategorizedView::dragMoveEvent(event);
// TODO: remove this code when the issue #160611 is solved in Qt 4.4
const QModelIndex index = indexAt(event->pos());
setDirtyRegion(m_dropRect);
- if (itemForIndex(index).isDir()) {
- m_dropRect = visualRect(index);
- } else {
- m_dropRect.setSize(QSize()); // set as invalid
+
+ m_dropRect.setSize(QSize()); // set as invalid
+ if (index.isValid()) {
+ const KFileItem item = itemForIndex(index);
+ if (!item.isNull() && item.isDir()) {
+ m_dropRect = visualRect(index);
+ } else {
+ m_dropRect.setSize(QSize()); // set as invalid
+ }
}
+ if (event->mimeData()->hasUrls()) {
+ // accept url drops, independently from the destination item
+ event->acceptProposedAction();
+ }
+
setDirtyRegion(m_dropRect);
}
}
}
- if (bypassVisualRectIssue()) {
- // TODO: check inline comment inside bypassVisualRectIssue() for details
- QAbstractItemView::dropEvent(event);
- } else {
- KCategorizedView::dropEvent(event);
- }
+ KCategorizedView::dropEvent(event);
m_dragging = false;
}
// TODO: remove this code when the issue #160611 is solved in Qt 4.4
if (m_dragging) {
- const QBrush& brush = m_viewOptions.palette.brush(QPalette::Normal, QPalette::Highlight);
- DragAndDropHelper::drawHoverIndication(viewport(), m_dropRect, brush);
+ const QBrush& brush = viewOptions().palette.brush(QPalette::Normal, QPalette::Highlight);
+ DragAndDropHelper::drawHoverIndication(this, m_dropRect, brush);
}
}
void DolphinIconsView::slotShowPreviewChanged()
{
const DolphinView* view = m_controller->dolphinView();
- const int infoCount = view->additionalInfo().count();
- updateGridSize(view->showPreview(), infoCount);
+ updateGridSize(view->showPreview(), additionalInfoCount());
}
void DolphinIconsView::slotAdditionalInfoChanged(const KFileItemDelegate::InformationList& info)
{
+ const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+ if (!settings->showAdditionalInfo()) {
+ return;
+ }
+
const bool showPreview = m_controller->dolphinView()->showPreview();
updateGridSize(showPreview, info.count());
}
settings->setItemWidth(settings->itemWidth() + diff);
settings->setItemHeight(settings->itemHeight() + diff);
- const int infoCount = m_controller->dolphinView()->additionalInfo().count();
- updateGridSize(showPreview, infoCount);
+ updateGridSize(showPreview, additionalInfoCount());
}
}
settings->setItemWidth(settings->itemWidth() - diff);
settings->setItemHeight(settings->itemHeight() - diff);
- const int infoCount = m_controller->dolphinView()->additionalInfo().count();
- updateGridSize(showPreview, infoCount);
+ updateGridSize(showPreview, additionalInfoCount());
}
}
}
Q_ASSERT(additionalInfoCount >= 0);
- itemHeight += additionalInfoCount * m_viewOptions.font.pointSize() * 2;
+ itemHeight += additionalInfoCount * m_font.pointSize() * 2;
if (settings->arrangement() == QListView::TopToBottom) {
// The decoration width indirectly defines the maximum
// width for the text wrapping. To use the maximum item width
// for text wrapping, it is used as decoration width.
- m_viewOptions.decorationSize = QSize(itemWidth, size);
+ m_decorationSize = QSize(itemWidth, size);
} else {
- m_viewOptions.decorationSize = QSize(size, size);
+ m_decorationSize = QSize(size, size);
}
+ m_itemSize = QSize(itemWidth, itemHeight);
+
const int spacing = settings->gridSpacing();
setGridSize(QSize(itemWidth + spacing * 2, itemHeight + spacing));
- m_itemSize = QSize(itemWidth, itemHeight);
-
m_controller->setZoomInPossible(isZoomInPossible());
m_controller->setZoomOutPossible(isZoomOutPossible());
}
return dirModel->itemForIndex(dirIndex);
}
-bool DolphinIconsView::bypassVisualRectIssue() const
+int DolphinIconsView::additionalInfoCount() const
{
- // TODO: QListView::visualRect() calculates a wrong position of the items under
- // certain circumstances (e. g. if the text is too long). This issue is bypassed
- // inside DolphinIconsView::visualRect(), but internally QListView does not use
- // visualRect() but the (non-virtual) QListView::rectForIndex(). This leads
- // to problems in combination with drag & drop operations: visual fragments get
- // created. To bypass the drag & drop issue the calls for QListView::dragMoveEvent(),
- // QListView::dropEvent() are replaced by the QAbstractItemView counterparts and
- // QAbstractItemView::startDrag() has been reimplemented.
- //
- // I'll try create a patch for Qt but as Dolphin must also work with
- // Qt 4.3.0 this workaround must get applied at least for KDE 4.0.
- KCategorizedSortFilterProxyModel* proxyModel = dynamic_cast<KCategorizedSortFilterProxyModel*>(model());
- return !proxyModel->isCategorizedModel();
+ const DolphinView* view = m_controller->dolphinView();
+ const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
+ return settings->showAdditionalInfo() ? view->additionalInfo().count() : 0;
}
#include "dolphiniconsview.moc"
projects / dolphin.git / blobdiff