Merge branch 'master' into feat/text-macro
This commit is contained in:
commit
d8ba6b0673
232 changed files with 12638 additions and 8527 deletions
|
|
@ -602,9 +602,7 @@ mod grid {
|
|||
frame.into_geometry()
|
||||
};
|
||||
|
||||
if self.scaling < 0.2 || !self.show_lines {
|
||||
vec![life, overlay]
|
||||
} else {
|
||||
if self.scaling >= 0.2 && self.show_lines {
|
||||
let grid =
|
||||
self.grid_cache.draw(renderer, bounds.size(), |frame| {
|
||||
frame.translate(center);
|
||||
|
|
@ -641,6 +639,8 @@ mod grid {
|
|||
});
|
||||
|
||||
vec![life, grid, overlay]
|
||||
} else {
|
||||
vec![life, overlay]
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue