Fix incorrect nesting status for valid cases.
This commit is contained in:
parent
f4f6ba9989
commit
a6437dbb3b
|
@ -1,6 +1,7 @@
|
|||
# Version 0.7.41 (unreleased)
|
||||
- Bug fixes.
|
||||
- Improve canceling nesting.
|
||||
- Fix incorrect nesting status for valid cases.
|
||||
|
||||
# Version 0.7.40 Nov 23, 2020
|
||||
- New function Warning.
|
||||
|
|
|
@ -438,15 +438,15 @@ int VBank::LeftToArrange() const
|
|||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
qreal VBank::GetBiggestDiagonal() const
|
||||
int VBank::FailedToArrange() const
|
||||
{
|
||||
return diagonal;
|
||||
return CountDetails(unsorted);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
int VBank::ArrangedCount() const
|
||||
qreal VBank::GetBiggestDiagonal() const
|
||||
{
|
||||
return details.size() - AllDetailsCount();
|
||||
return diagonal;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -80,7 +80,7 @@ public:
|
|||
|
||||
int AllDetailsCount() const;
|
||||
int LeftToArrange() const;
|
||||
int ArrangedCount() const;
|
||||
int FailedToArrange() const;
|
||||
|
||||
qreal GetBiggestDiagonal() const;
|
||||
|
||||
|
|
|
@ -267,6 +267,11 @@ void VLayoutGenerator::Generate(const QElapsedTimer &timer, qint64 timeout, Layo
|
|||
{
|
||||
UnitePages();
|
||||
}
|
||||
|
||||
if (bank->FailedToArrange() == 0)
|
||||
{
|
||||
state = LayoutErrors::NoError;
|
||||
}
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
Loading…
Reference in New Issue
Block a user