Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed a Grid editor issue #1308

Merged
merged 4 commits into from
Mar 10, 2020
Merged

Fixed a Grid editor issue #1308

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fd41d4
Fixed a Grid editor issue
ivan100sic Feb 17, 2020
af744ae
Explained the fix in ExtendRangeToHaveEvenCellEdges
ivan100sic Mar 5, 2020
bef8ccc
Simplified code in ExtendRangeToHaveEvenCellEdges
ivan100sic Mar 5, 2020
de5f5b8
Removed redundant comment, more camelCase
ivan100sic Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 16 additions & 48 deletions src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,80 +137,48 @@ private void ExtendRangeToHaveEvenCellEdges()
// extend each edge of the [(_startCol, _startRow) - (_endCol, _endRow)] range based on merged cells until you have 4 straight edges with no "straddling cells"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function name ExtendOverhangingPartsToMinimalProperRectangle

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This name is arguable but let's just leave it as-is.

GridLayoutModel model = Model;

while (_startRow > 0)
// As long as there is an edge of the 2D range such that some zone crosses its boundary, extend that boundary.
// A single pass is not enough, a while loop is needed. This results in the unique smallest rectangle containing
// the initial range such that no zone is "broken".
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As code would be self-explaining now. Comments would be needless

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The whole code has been simplified, do you mind taking another look?

bool possibly_broken = true;

while (possibly_broken)
{
bool dirty = false;
possibly_broken = false;

for (int col = _startCol; col <= _endCol; col++)
{
if (model.CellChildMap[_startRow - 1, col] == model.CellChildMap[_startRow, col])
if (_startRow > 0 && model.CellChildMap[_startRow - 1, col] == model.CellChildMap[_startRow, col])
{
_startRow--;
dirty = true;
possibly_broken = true;
break;
}
}

if (!dirty)
{
break;
}
}

while (_endRow < model.Rows - 1)
{
bool dirty = false;
for (int col = _startCol; col <= _endCol; col++)
{
if (model.CellChildMap[_endRow + 1, col] == model.CellChildMap[_endRow, col])
if (_endRow < model.Rows - 1 && model.CellChildMap[_endRow + 1, col] == model.CellChildMap[_endRow, col])
{
_endRow++;
dirty = true;
possibly_broken = true;
break;
}
}

if (!dirty)
{
break;
}
}

while (_startCol > 0)
{
bool dirty = false;
for (int row = _startRow; row <= _endRow; row++)
{
if (model.CellChildMap[row, _startCol - 1] == model.CellChildMap[row, _startCol])
if (_startCol > 0 && model.CellChildMap[row, _startCol - 1] == model.CellChildMap[row, _startCol])
{
_startCol--;
dirty = true;
possibly_broken = true;
break;
}
}

if (!dirty)
{
break;
}
}

while (_endCol < model.Columns - 1)
{
bool dirty = false;
for (int row = _startRow; row <= _endRow; row++)
{
if (model.CellChildMap[row, _endCol + 1] == model.CellChildMap[row, _endCol])
if (_endCol < model.Columns - 1 && model.CellChildMap[row, _endCol + 1] == model.CellChildMap[row, _endCol])
{
_endCol++;
dirty = true;
possibly_broken = true;
break;
}
}

if (!dirty)
{
break;
}
}
}

Expand Down