Fix 3.36 icon grid scaling when using display scaling
This MR contains two fixes, the first one addresses #3090 (closed) which is a regression introduced in 6b86b6a3.
Please see these screenshots from the reporter of the issue, since I don't have the hardware to properly reproduce the problem:
With this MR: https://gitlab.gnome.org/GNOME/gnome-shell/uploads/4335335710ebd08d50d9b8d6e6be28d6/Screenshot_from_2020-08-21_11-36-31.png
The second patch is for a related issue I noticed when trying to reproduce the problem by using 2x scaling on a 1920x1080 display with a horizontal dock.
Here is a screenshot with just the first patch applied:
And here with the first and second:
This however also affects the non-dock case for 1920x1080@2x and causes there to be 3 rows now instead of 4.
With just the first patch:
With first and second:
All of these situations in which the second fix has any kind of effect are a bit contrived though, so I would not mind dropping it.