mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-09-03 16:05:12 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Fixed a Grid editor issue (#1308)

Browse Source 
* Fixed a Grid editor issue

* Explained the fix in ExtendRangeToHaveEvenCellEdges

* Simplified code in ExtendRangeToHaveEvenCellEdges

* Removed redundant comment, more camelCase
This commit is contained in:
Ivan Stošić
2020-03-10 23:23:35 +01:00
committed by GitHub
parent 852689b3df
commit 4632224e9b
1 changed files with 16 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/modules/fancyzones/editor/FancyZonesEditor/GridEditor.xaml.cs
View File

@@ -134,83 +134,50 @@ namespace FancyZonesEditor
private void ExtendRangeToHaveEvenCellEdges() 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" // 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", meaning that
// some part of it is inside the 2D range, and some part is outside.
GridLayoutModel model = Model; GridLayoutModel model = Model;
bool possiblyBroken = true;
while (_startRow > 0) while (possiblyBroken)
{ {
bool dirty = false; possiblyBroken = false;
for (int col = _startCol; col <= _endCol; col++) 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--; _startRow--;
dirty = true; possiblyBroken = true;
break; break;
} }
}
if (!dirty) if (_endRow < model.Rows - 1 && model.CellChildMap[_endRow + 1, col] == model.CellChildMap[_endRow, col])
{
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])
{ {
_endRow++; _endRow++;
dirty = true; possiblyBroken = true;
break; break;
} }
} }
if (!dirty)
{
break;
}
}
while (_startCol > 0)
{
bool dirty = false;
for (int row = _startRow; row <= _endRow; row++) 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--; _startCol--;
dirty = true; possiblyBroken = true;
break; break;
} }
}
if (!dirty) if (_endCol < model.Columns - 1 && model.CellChildMap[row, _endCol + 1] == model.CellChildMap[row, _endCol])
{
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])
{ {
_endCol++; _endCol++;
dirty = true; possiblyBroken = true;
break; break;
} }
} }
if (!dirty)
{
break;
}
} }
} }