napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compensate for small partition visibility in Splitter widget.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-02-17 16:24:39 +01:00
parent 43cfbaa15d
commit 7bf918bfee
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/modules/partition/gui/PartitionSplitterWidget.cpp
View File

@ -70,6 +70,8 @@ PartitionSplitterWidget::init( Device* dev, bool drawNestedPartitions )
{} {}
}; };
// If we don't draw child partitions of a partitions as child partitions, we
// need to flatten the items tree into an items list
if ( drawNestedPartitions ) if ( drawNestedPartitions )
{ {
if ( ( *it )->roles().has( PartitionRole::Logical ) && extendedPartitionItem ) if ( ( *it )->roles().has( PartitionRole::Logical ) && extendedPartitionItem )
@ -450,16 +452,14 @@ PartitionSplitterWidget::drawResizeHandle( QPainter* painter,
void void
PartitionSplitterWidget::drawPartitions( QPainter* painter, PartitionSplitterWidget::drawPartitions( QPainter* painter,
const QRect& rect, const QRect& rect,
const QList< PartitionSplitterItem >& items ) const QList< PartitionSplitterItem >& itemList )
{ {
const int count = items.count(); const int count = itemList.count();
const int totalWidth = rect.width(); const int totalWidth = rect.width();
qint64 total = 0; auto pair = computeItemsVector( itemList );
for ( int row = 0; row < count; ++row ) QList< PartitionSplitterItem >& items = pair.first;
{ qreal total = pair.second;
total += items[ row ].size;
}
int x = rect.x(); int x = rect.x();
for ( int row = 0; row < count; ++row ) for ( int row = 0; row < count; ++row )
@ -467,7 +467,7 @@ PartitionSplitterWidget::drawPartitions( QPainter* painter,
const PartitionSplitterItem& item = items[ row ]; const PartitionSplitterItem& item = items[ row ];
int width; int width;
if ( row < count - 1 ) if ( row < count - 1 )
width = totalWidth * ( item.size / static_cast< qreal >( total ) ); width = totalWidth * ( item.size / total );
else else
// Make sure we fill the last pixel column // Make sure we fill the last pixel column
width = rect.right() - x + 1; width = rect.right() - x + 1;
@ -517,3 +517,43 @@ PartitionSplitterWidget::_findItem( QList< PartitionSplitterItem >& items,
} }
return nullptr; return nullptr;
} }
QPair< QList< PartitionSplitterItem >, qreal >
PartitionSplitterWidget::computeItemsVector( const QList< PartitionSplitterItem >& originalItems ) const
{
QList< PartitionSplitterItem > items;
qreal total = 0;
for ( int row = 0; row < originalItems.count(); ++row )
{
if ( !originalItems[ row ].children.isEmpty() )
{
items += originalItems[ row ];
total += originalItems[ row ].size;
}
else
{
PartitionSplitterItem thisItem = originalItems[ row ];
QPair< QList< PartitionSplitterItem >, qreal > r = computeItemsVector( thisItem.children );
thisItem.children = r.first;
thisItem.size = r.second;
items += thisItem;
}
}
// The sizes we have are perfect, but now we have to hardcode a minimum size for small
// partitions and compensate for it in the total.
qreal adjustedTotal = total;
for ( int row = 0; row < items.count(); ++row )
{
if ( items[ row ].size < 0.01 * total ) // If this item is smaller than 1% of everything,
{ // force its width to 1%.
adjustedTotal -= items[ row ].size;
items[ row ].size = 0.01 * total;
adjustedTotal += items[ row ].size;
}
}
return qMakePair( items, adjustedTotal );
}

5
src/modules/partition/gui/PartitionSplitterWidget.h
View File

@ -67,7 +67,7 @@ private:
void drawPartitions( QPainter* painter, void drawPartitions( QPainter* painter,
const QRect& rect, const QRect& rect,
const QList< PartitionSplitterItem >& items ); const QList< PartitionSplitterItem >& itemList );
void drawSection( QPainter* painter, const QRect& rect_, int x, int width, void drawSection( QPainter* painter, const QRect& rect_, int x, int width,
const PartitionSplitterItem& item ); const PartitionSplitterItem& item );
void drawResizeHandle( QPainter* painter, void drawResizeHandle( QPainter* painter,
@ -78,6 +78,9 @@ private:
PartitionSplitterItem* _findItem( QList< PartitionSplitterItem >& items, PartitionSplitterItem* _findItem( QList< PartitionSplitterItem >& items,
F condition ); F condition );
QPair< QList< PartitionSplitterItem >, qreal >
computeItemsVector( const QList< PartitionSplitterItem >& originalItems ) const;
QList< PartitionSplitterItem > m_items; QList< PartitionSplitterItem > m_items;
QString m_itemToResizePath; QString m_itemToResizePath;
PartitionSplitterItem* m_itemToResize; PartitionSplitterItem* m_itemToResize;