New modern screen template Header and Gallery screen Wrap issue

[AndrewB]

I'm experiencing an issue with the new modern screen template rendering correctly.   For testing purposes, I'm just using the OOTB sample.

When I run the preview, canvas size works perfectly.  If I change it to window size, all of the gallery items show in a single column.

Even after I've published the app and deployed to Teams, I see the same behavior.

I would like windows size to render a 3 count wrap like the canvas and keep the padding between.  Unfortunately when I try to set the wrap count to 3 or 4 for Windows size, I lose the padding and the page starts flickering on hover.   I can't seem to locate the property for correcting this.

Canvas Size

Window Size

I would like windows size to render 3 count wrap like the canvas.   

When I look at the OOTB page I created, the Gallery WrapCount property is set to:

If(Screen1.Size = ScreenSize.ExtraLarge , 3, Screen1.Size = ScreenSize.Large, 2, 1)

When checking the ScreenSize property on render, ScreenSize.ExtraLarge has a value of 4.   If I look at the variable in when rendering in Windows size, the actual value is 5.   

If I modify the WrapCount formula to account for this, I lose the padding between the tiles and the page flickers.

If(Screen1.Size >= ScreenSize.ExtraLarge , 3, Screen1.Size = ScreenSize.Large, 2, 1)

I appreciate anyone's help here. 

[AndrewB · Accepted solution]

I think I've found a solution.   

I set the gallery control WrapCount property to:

If(UserScreen.Size >= ScreenSize.ExtraLarge , 3, UserScreen.Size = ScreenSize.Large, 2, 1)

Set the child gallery container control Width property to:

If(UserScreen.Size >= ScreenSize.ExtraLarge, (Parent.Width / 3) - 15, UserScreen.Size = ScreenSize.Large, (Parent.Width / 2) - 15 , Parent.Width)

The key was to change the if statement logic to >=  to accommodate the UserScreen.Size being returned with a value of 5.   

That exceeds ScreeSize.ExtraLarge Enum being equal to 4 there by hitting the default value in the if statement.

I now have the correctly formatted gallery in Windows size.