kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'KDE/4.14'

Browse source 
Conflicts:
	dolphin/src/dolphin.appdata.xml
This commit is contained in:
Emmanuel Pescosta 2014-08-14 18:28:51 +02:00
parent cdebd19925 b73aeb4598
commit 4b758c386f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/statusbar/dolphinstatusbar.cpp
View file

@ -109,18 +109,19 @@ DolphinStatusBar::DolphinStatusBar(QWidget* parent) :
const int zoomSliderHeight = m_zoomSlider->minimumSizeHint().height();
const int contentHeight = qMax(fontHeight, zoomSliderHeight);
QFontMetrics fontMetrics(m_label->font());
m_label->setFixedHeight(contentHeight);
m_label->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
m_zoomSlider->setFixedHeight(contentHeight);
m_zoomSlider->setMaximumWidth(150);
m_zoomSlider->setMaximumWidth(fontMetrics.averageCharWidth() * 15);
m_spaceInfo->setFixedHeight(contentHeight);
m_spaceInfo->setMaximumWidth(150);
m_spaceInfo->setMaximumWidth(fontMetrics.averageCharWidth() * 15);
m_spaceInfo->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
m_progressBar->setFixedHeight(contentHeight);
m_progressBar->setMaximumWidth(150);
m_progressBar->setMaximumWidth(fontMetrics.averageCharWidth() * 15);
QHBoxLayout* topLayout = new QHBoxLayout(this);
topLayout->setMargin(0);