kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adjust the size and position of the selection toggle on icon

Browse source 
resize (when changing the zoomlevel).

BUG: 310412
REVIEW: 112250
FIXED-IN: 4.11.1
This commit is contained in:
Emmanuel Pescosta 2013-08-24 21:00:26 +02:00
parent ab8ee1a6a9
commit f3ca94354b
3 changed files with 44 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dolphin/src/kitemviews/kitemlistwidget.cpp
View file

@ -451,6 +451,12 @@ void KItemListWidget::resizeEvent(QGraphicsSceneResizeEvent* event)
{
QGraphicsWidget::resizeEvent(event);
clearHoverCache();
if (m_selectionToggle) {
const QRectF& toggleRect = selectionToggleRect();
m_selectionToggle->setPos(toggleRect.topLeft());
m_selectionToggle->resize(toggleRect.size());
}
}
qreal KItemListWidget::hoverOpacity() const

51
dolphin/src/kitemviews/private/kitemlistselectiontoggle.cpp
View file

@ -79,28 +79,49 @@ void KItemListSelectionToggle::hoverLeaveEvent(QGraphicsSceneHoverEvent* event)
m_pixmap = QPixmap();
}
void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
{
QGraphicsWidget::resizeEvent(event);
if (!m_pixmap.isNull()) {
const int pixmapSize = m_pixmap.size().width(); // Pixmap width is always equal pixmap height
if (pixmapSize != iconSize()) {
// If the required icon size is different from the actual pixmap size,
// overwrite the m_pixmap with an empty pixmap and reload the new
// icon on next re-painting.
m_pixmap = QPixmap();
}
}
}
void KItemListSelectionToggle::updatePixmap()
{
const char* icon = m_checked ? "list-remove" : "list-add";
int iconSize = qMin(size().width(), size().height());
if (iconSize < KIconLoader::SizeSmallMedium) {
iconSize = KIconLoader::SizeSmall;
} else if (iconSize < KIconLoader::SizeMedium) {
iconSize = KIconLoader::SizeSmallMedium;
} else if (iconSize < KIconLoader::SizeLarge) {
iconSize = KIconLoader::SizeMedium;
} else if (iconSize < KIconLoader::SizeHuge) {
iconSize = KIconLoader::SizeLarge;
} else if (iconSize < KIconLoader::SizeEnormous) {
iconSize = KIconLoader::SizeHuge;
}
m_pixmap = KIconLoader::global()->loadIcon(QLatin1String(icon), KIconLoader::NoGroup, iconSize);
m_pixmap = KIconLoader::global()->loadIcon(QLatin1String(icon), KIconLoader::NoGroup, iconSize());
if (m_hovered) {
KIconLoader::global()->iconEffect()->apply(m_pixmap, KIconLoader::Desktop, KIconLoader::ActiveState);
}
}
int KItemListSelectionToggle::iconSize() const
{
const int iconSize = qMin(size().width(), size().height());
if (iconSize < KIconLoader::SizeSmallMedium) {
return KIconLoader::SizeSmall;
} else if (iconSize < KIconLoader::SizeMedium) {
return KIconLoader::SizeSmallMedium;
} else if (iconSize < KIconLoader::SizeLarge) {
return KIconLoader::SizeMedium;
} else if (iconSize < KIconLoader::SizeHuge) {
return KIconLoader::SizeLarge;
} else if (iconSize < KIconLoader::SizeEnormous) {
return KIconLoader::SizeHuge;
}
return iconSize;
}
#include "kitemlistselectiontoggle.moc"

2
dolphin/src/kitemviews/private/kitemlistselectiontoggle.h
View file

@ -46,9 +46,11 @@ public:
protected:
virtual void hoverEnterEvent(QGraphicsSceneHoverEvent* event);
virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent* event);
virtual void resizeEvent(QGraphicsSceneResizeEvent* event);
private:
void updatePixmap();
int iconSize() const;
private:
bool m_checked;