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

make resizeLogicals take start and end delta as args to it does not always have 

to delete and re-create the unallocated first and last child in an extended
partition, which is a waste of resources

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1116005
This commit is contained in:
Volker Lanz 2010-04-18 11:36:00 +00:00
parent 2bbb4ddcb4
commit d4772c37fb
3 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/newdialog.cpp
View File

@ -141,7 +141,7 @@ void NewDialog::onRoleChanged(bool)
setupConstraints();
dialogWidget().partResizerWidget().resizeLogicals();
dialogWidget().partResizerWidget().resizeLogicals(0, 0, true);
dialogWidget().partResizerWidget().update();
updateHideAndShow();

44
src/gui/partresizerwidget.cpp
View File

@ -306,10 +306,13 @@ bool PartResizerWidget::updateFirstSector(qint64 newFirstSector)
if (newFirstSector != partition().firstSector() && (partition().children().size() == 0 || checkAlignment(*partition().children().first(), partition().firstSector() - newFirstSector)))
{
const qint64 deltaFirst = partition().firstSector() - newFirstSector;
partition().setFirstSector(newFirstSector);
partition().fileSystem().setFirstSector(newFirstSector);
resizeLogicals();
resizeLogicals(deltaFirst, 0);
updatePositions();
emit firstSectorChanged(partition().firstSector());
@ -333,14 +336,39 @@ bool PartResizerWidget::checkAlignment(const Partition& child, qint64 delta) con
return qAbs(delta) >= PartitionAlignment::sectorAlignment(device());
}
void PartResizerWidget::resizeLogicals()
void PartResizerWidget::resizeLogicals(qint64 deltaFirst, qint64 deltaLast, bool force)
{
Q_ASSERT(device().partitionTable());
if (deltaFirst != 0 && partition().children().size() > 0 && partition().children().first()->roles().has(PartitionRole::Unallocated))
{
qint64 start = partition().children().first()->firstSector() - deltaFirst;
qint64 end = partition().children().first()->lastSector() + deltaLast;
if (PartitionTable::getUnallocatedRange(device(), partition(), start, end))
{
partition().children().first()->setFirstSector(start);
deltaFirst = 0;
}
}
device().partitionTable()->removeUnallocated(&partition());
if (deltaLast != 0 && partition().children().size() > 0 && partition().children().last()->roles().has(PartitionRole::Unallocated))
{
qint64 start = partition().children().last()->firstSector() - deltaFirst;
qint64 end = partition().children().last()->lastSector() + deltaLast;
if (PartitionTable::getUnallocatedRange(device(), partition(), start, end))
{
partition().children().last()->setLastSector(end);
deltaLast = 0;
}
}
if (partition().roles().has(PartitionRole::Extended))
device().partitionTable()->insertUnallocated(device(), &partition(), partition().firstSector());
if (force || deltaFirst != 0 || deltaLast != 0)
{
Q_ASSERT(device().partitionTable());
device().partitionTable()->removeUnallocated(&partition());
if (partition().roles().has(PartitionRole::Extended))
device().partitionTable()->insertUnallocated(device(), &partition(), partition().firstSector());
}
partWidget().updateChildren();
}
@ -366,10 +394,12 @@ bool PartResizerWidget::updateLastSector(qint64 newLastSector)
if (newLastSector != partition().lastSector() && (partition().children().size() == 0 || checkAlignment(*partition().children().last(), partition().lastSector() - newLastSector)))
{
const qint64 deltaLast = newLastSector - partition().lastSector();
partition().setLastSector(newLastSector);
partition().fileSystem().setLastSector(newLastSector);
resizeLogicals();
resizeLogicals(0, deltaLast);
updatePositions();
emit lastSectorChanged(partition().lastSector());

2
src/gui/partresizerwidget.h
View File

@ -123,7 +123,7 @@ class PartResizerWidget : public QWidget
void set(qint64 newCap, qint64 newFreeBefore, qint64 newFreeAfter);
void resizeLogicals();
void resizeLogicals(qint64 deltaFirst, qint64 deltaLast, bool force = false);
bool checkAlignment(const Partition& child, qint64 delta) const;