BusinessMgr 3.0.2 .Net8
This commit is contained in:
@@ -1,10 +1,4 @@
|
||||
using Microsoft.Maui.Controls.Compatibility;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Sarand.Net.Mobile.Maui.Layouts
|
||||
{
|
||||
@@ -139,7 +133,7 @@ namespace Sarand.Net.Mobile.Maui.Layouts
|
||||
|
||||
var size = child.Measure(widthConstraint, heightConstraint);
|
||||
var itemWidth = (double)columnsSize;
|
||||
var itemHeight = size.Request.Height;
|
||||
var itemHeight = size.Height;
|
||||
|
||||
if (IsSquare)
|
||||
{
|
||||
@@ -201,8 +195,8 @@ namespace Sarand.Net.Mobile.Maui.Layouts
|
||||
{
|
||||
var child = childBlock.current.child;
|
||||
var size = childBlock.current.size;
|
||||
var itemWidth = size.Request.Width;
|
||||
var itemHeight = size.Request.Height;
|
||||
var itemWidth = size.Width;
|
||||
var itemHeight = size.Height;
|
||||
|
||||
rowHeight = Math.Max(rowHeight, itemHeight + SpacingY);
|
||||
rowWidth += itemWidth + SpacingX;
|
||||
@@ -224,7 +218,7 @@ namespace Sarand.Net.Mobile.Maui.Layouts
|
||||
}
|
||||
|
||||
xPos += itemWidth + SpacingX;
|
||||
var nextWitdh = childBlock.next.size.Request.Width;
|
||||
var nextWitdh = childBlock.next.size.Width;
|
||||
|
||||
if (xPos + nextWitdh - x > widthConstraint)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user