mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Grid: Refactor to move columnFirst data member to set Comparator

Browse source
This commit is contained in:
reuk 2024-11-18 21:08:38 +00:00
parent d4107836cd
commit 8fa09ae8ab
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
1 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
modules/juce_gui_basics/layout/juce_Grid.cpp
View file

@ -651,7 +651,7 @@ struct Grid::Helpers
{
for (int i = 0; i < columnSpan; i++)
for (int j = 0; j < rowSpan; j++)
setCell (cell.column + i, cell.row + j);
occupiedCells.insert ({ cell.column + i, cell.row + j });
return { { cell.column, cell.column + columnSpan }, { cell.row, cell.row + rowSpan } };
}
@ -700,36 +700,30 @@ struct Grid::Helpers
}
private:
struct SortableCell
struct Comparator
{
int column, row;
bool columnFirst;
bool operator< (const SortableCell& other) const
bool operator() (const Cell& a, const Cell& b) const
{
if (columnFirst)
{
if (row == other.row)
return column < other.column;
if (a.row == b.row)
return a.column < b.column;
return row < other.row;
return a.row < b.row;
}
if (row == other.row)
return column < other.column;
if (a.row == b.row)
return a.column < b.column;
return row < other.row;
return a.row < b.row;
}
};
void setCell (int column, int row)
{
occupiedCells.insert ({ column, row, columnFirst });
}
const bool columnFirst;
};
bool isOccupied (Cell cell) const
{
return occupiedCells.count ({ cell.column, cell.row, columnFirst }) > 0;
return occupiedCells.count (cell) > 0;
}
bool isOccupied (Cell cell, int columnSpan, int rowSpan) const
@ -780,8 +774,11 @@ struct Grid::Helpers
}
int highestCrossDimension;
bool columnFirst;
std::set<SortableCell> occupiedCells;
const bool columnFirst;
std::set<Cell, Comparator> occupiedCells { Comparator { columnFirst } };
JUCE_DECLARE_NON_COPYABLE (OccupancyPlane)
JUCE_DECLARE_NON_MOVEABLE (OccupancyPlane)
};
//==============================================================================