Skip to content

Fix #1887: cardDlg() should use cornerRadius from card size definition #2300

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

Open
kellyelton wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #1887: cardDlg() should use cornerRadius from card size definition #2300

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
19 changes: 18 additions & 1 deletion octgnFX/Octgn.JodsEngine/Scripting/Controls/CardDlg.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,24 @@ private void SetPicture(object sender, RoutedEventArgs e)
var img = sender as Image;
if (img == null) return;
var model = img.DataContext as DataNew.Entities.Card;
if (model != null) ImageUtils.GetCardImage(model, x => img.Source = x);
if (model == null) return;
var cardSize = model.Size;
if (cardSize == null || cardSize.CornerRadius <= 0)
{
ImageUtils.GetCardImage(model, x => img.Source = x);
return;
}
img.Clip = new RectangleGeometry();
SizeChangedEventHandler onSizeChanged = null;
onSizeChanged = (_, __) =>
{
var clipRect = (RectangleGeometry)img.Clip;
clipRect.Rect = new Rect(img.ActualWidth, img.ActualHeight);
clipRect.RadiusX = clipRect.RadiusY = cardSize.CornerRadius * img.ActualHeight / cardSize.Height;
img.SizeChanged -= onSizeChanged;
};
img.SizeChanged += onSizeChanged;
ImageUtils.GetCardImage(model, x => img.Source = x);
}

private void ComputeChildWidth(object sender, RoutedEventArgs e)
Expand Down