peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

addCell -> expandTo

Browse Source
This commit is contained in:
Uwe Rathmann 2019-07-09 14:52:43 +02:00
parent bfe2b58ae3
commit 49c216b582
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/layouts/QskLayoutChain.cpp
View File

@ -34,13 +34,13 @@ void QskLayoutChain::reset( int count, qreal constraint )
m_sumStretches = 0; m_sumStretches = 0;
} }
void QskLayoutChain::addCell( int index, const Cell& cell ) void QskLayoutChain::expandTo( int index, const Cell& newCell )
{ {
auto& combinedCell = m_cells[ index ]; auto& cell = m_cells[ index ];
combinedCell.canGrow |= cell.canGrow; cell.canGrow |= newCell.canGrow;
combinedCell.stretch = qMax( combinedCell.stretch, cell.stretch ); cell.stretch = qMax( cell.stretch, newCell.stretch );
combinedCell.hint.intersect( cell.hint ); cell.hint.intersect( newCell.hint );
} }
void QskLayoutChain::finish() void QskLayoutChain::finish()

2
src/layouts/QskLayoutChain.h
View File

@ -52,7 +52,7 @@ class QskLayoutChain
void invalidate(); void invalidate();
void reset( int count, qreal constraint ); void reset( int count, qreal constraint );
void addCell( int index, const Cell& ); void expandTo( int index, const Cell& );
void finish(); void finish();
const Cell& cell( int index ) const { return m_cells[ index ]; } const Cell& cell( int index ) const { return m_cells[ index ]; }

2
src/layouts/QskLinearLayoutEngine.cpp
View File

@ -616,7 +616,7 @@ void EntryTable::resetChain( Qt::Orientation orientation,
constraints.isEmpty() ? -1.0 : constraints[index1].length; constraints.isEmpty() ? -1.0 : constraints[index1].length;
const auto cell = this->cell( entry, orientation, cellConstraint ); const auto cell = this->cell( entry, orientation, cellConstraint );
chain.addCell( index2, cell ); chain.expandTo( index2, cell );
if ( m_orientation != orientation ) if ( m_orientation != orientation )
{ {