andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

no one is calling the code in drawPartition() but the paint event so move it to 

the paint event handler. also, remove a superflous assert in the ctor.

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1113987
This commit is contained in:
Volker Lanz 2010-04-12 12:48:17 +00:00
parent 0d2f3ccc84
commit 3f1b211df9
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/partwidget.cpp
View File

@ -50,8 +50,6 @@ PartWidget::PartWidget(QWidget* parent, const PartTableWidget* ptWidget, const P
{
setFont(KGlobalSettings::smallestReadableFont());
Q_ASSERT(p);
setToolTip(partition().deviceNode() + '\n' + partition().fileSystem().name() + ' ' + Capacity(partition()).toString());
updateChildren();
@ -92,27 +90,22 @@ void PartWidget::resizeEvent(QResizeEvent*)
positionChildren(this, partition().children(), childWidgets());
}
void PartWidget::paintEvent(QPaintEvent*)
{
drawPartition(this);
}
QColor PartWidget::activeColor(const QColor& col) const
{
return active() ? col.darker(130) : col;
}
void PartWidget::drawPartition(QWidget* destWidget)
void PartWidget::paintEvent(QPaintEvent*)
{
const int usedPercentage = partition().used() * 100 / partition().capacity();
const int w = (destWidget->width() - 1 - (PartWidget::borderWidth() * 2)) * usedPercentage / 100;
const int w = (width() - 1 - (PartWidget::borderWidth() * 2)) * usedPercentage / 100;
QPainter painter(destWidget);
QPainter painter(this);
// draw border
painter.setPen(active() ? QColor(250, 250, 250) : QColor(20, 20, 20));
painter.setBrush(activeColor(Config::fileSystemColorCode(partition().fileSystem().type())));
painter.drawRect(QRect(0, 0, destWidget->width() - 1, destWidget->height() - 1));
painter.drawRect(QRect(0, 0, width() - 1, height() - 1));
if (partition().roles().has(PartitionRole::Extended))
return;
@ -121,17 +114,17 @@ void PartWidget::drawPartition(QWidget* destWidget)
{
// draw free space background
painter.setBrush(activeColor(Config::availableSpaceColorCode()));
painter.drawRect(QRect(PartWidget::borderWidth(), PartWidget::borderHeight(), destWidget->width() - 1 - (PartWidget::borderWidth() * 2), destWidget->height() - (PartWidget::borderHeight() * 2)));
painter.drawRect(QRect(PartWidget::borderWidth(), PartWidget::borderHeight(), width() - 1 - (PartWidget::borderWidth() * 2), height() - (PartWidget::borderHeight() * 2)));
// draw used space in front of that
painter.setBrush(activeColor(Config::usedSpaceColorCode()));
painter.drawRect(QRect(PartWidget::borderWidth(), PartWidget::borderHeight(), w, destWidget->height() - (PartWidget::borderHeight() * 2)));
painter.drawRect(QRect(PartWidget::borderWidth(), PartWidget::borderHeight(), w, height() - (PartWidget::borderHeight() * 2)));
}
// draw name and size
QString text = partition().deviceNode().remove("/dev/") + '\n' + Capacity(partition()).toString();
const QRect textRect(0, 0, destWidget->width() - 1, destWidget->height() - 1);
const QRect textRect(0, 0, width() - 1, height() - 1);
const QRect boundingRect = painter.boundingRect(textRect, Qt::AlignVCenter | Qt::AlignHCenter, text);
if (boundingRect.x() > PartWidgetBase::borderWidth() && boundingRect.y() > PartWidgetBase::borderHeight())
painter.drawText(textRect, Qt::AlignVCenter | Qt::AlignHCenter, text);

1
src/gui/partwidget.h
View File

@ -61,7 +61,6 @@ class PartWidget : public QWidget, public PartWidgetBase
QList<PartWidget*>& childWidgets() { return m_ChildWidgets; }
const QList<PartWidget*>& childWidgets() const { return m_ChildWidgets; }
void drawPartition(QWidget* destWidget);
bool showChildren() const { return m_ShowChildren; }
QColor activeColor(const QColor& col) const;