Skip to content

fix(grid): order of adding items should not affect drawing #991

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

Closed
darylhjd wants to merge 1 commit into from
Closed

fix(grid): order of adding items should not affect drawing #991

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions grid.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,8 @@ func (g *Grid) Draw(screen tcell.Screen) {
x, y, width, height := g.GetInnerRect()
screenWidth, screenHeight := screen.Size()

// Make a list of items which apply.
items := make([]*gridItem, 0, len(g.items))
// Make a map of items that apply.
items := map[Primitive]*gridItem{}
ItemLoop:
for _, item := range g.items {
item.visible = false
Expand All @@ -282,7 +282,7 @@ ItemLoop:
}

// Check for overlaps and multiple layouts of the same item.
for index, existing := range items {
for _, existing := range items {
// Do they overlap or are identical?
if item.Item != existing.Item &&
(item.Row >= existing.Row+existing.Height || item.Row+item.Height <= existing.Row ||
Expand All @@ -304,12 +304,12 @@ ItemLoop:
if itemMin < existingMin {
continue ItemLoop // This one isn't. Drop it.
}
items[index] = item // This one is. Replace the other.
items[item.Item] = item // This one is. Replace the other.
continue ItemLoop
}

// This item will be visible.
items = append(items, item)
items[item.Item] = item
}

// How many rows and columns do we have?
Expand Down