┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/dolphincolumnview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/dolphincolumnview.cpp')
-rw-r--r--src/dolphincolumnview.cpp18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index bfbc5d9f1..7e74b7e34 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -370,11 +370,13 @@ void DolphinColumnView::updateDecorationSize()
{
ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
const int iconSize = settings->iconSize();
+ const QSize size(iconSize, iconSize);
+ setIconSize(size);
foreach (QObject* object, viewport()->children()) {
if (object->inherits("QListView")) {
DolphinColumnWidget* widget = static_cast<DolphinColumnWidget*>(object);
- widget->setDecorationSize(QSize(iconSize, iconSize));
+ widget->setDecorationSize(size);
}
}
@@ -393,8 +395,12 @@ void DolphinColumnView::updateColumnsBackground(bool active)
m_active = active;
// dim the background of the viewport
- QPalette palette;
- palette.setColor(viewport()->backgroundRole(), QColor(0, 0, 0, 0));
+ const QPalette::ColorRole role = viewport()->backgroundRole();
+ QColor background = viewport()->palette().color(role);
+ background.setAlpha(0); // make background transparent
+
+ QPalette palette = viewport()->palette();
+ palette.setColor(role, background);
viewport()->setPalette(palette);
foreach (DolphinColumnWidget* column, m_columns) {
@@ -503,8 +509,9 @@ void DolphinColumnView::assureVisibleActiveColumn()
} else {
m_animation->setFrameRange(-m_contentX, -newContentX);
}
- if(m_animation->state() != QTimeLine::Running)
+ if (m_animation->state() != QTimeLine::Running) {
m_animation->start();
+ }
} else if (x < 0) {
const int newContentX = m_contentX - x;
if (isRightToLeft()) {
@@ -512,8 +519,9 @@ void DolphinColumnView::assureVisibleActiveColumn()
} else {
m_animation->setFrameRange(-m_contentX, -newContentX);
}
- if(m_animation->state() != QTimeLine::Running)
+ if (m_animation->state() != QTimeLine::Running) {
m_animation->start();
+ }
}
}