Merge pull request #1445 from kellyelton/master

Fixed some issues with card inversion and card sizes fixes #1444

Author: kellyelton

octgnFX/Octgn/Play/Gui/CardControl.xaml.cs

@@ -382,7 +382,7 @@ private void PropertyChangeHandler(object sender, PropertyChangedEventArgs e)
         private void UpdateInvertedTransform()
         {
             if (_invertTransform == null || Card == null) return;
-            IsInverted = TableControl.IsInInvertedZone(Card.Y);
+            IsInverted = TableControl.IsInInvertedZone(Card.Y, Card.Size);
             _invertTransform.ScaleX = _invertTransform.ScaleY = IsInverted ? -1 : 1;
         }
 

octgnFX/Octgn/Play/Gui/TableControl.xaml.cs

@@ -12,7 +12,7 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Threading;
 using System.Threading.Tasks;
-
+using Octgn.DataNew.Entities;
 using Octgn.Play.Actions;
 using Octgn.Play.Gui.Adorners;
 using Octgn.Play.Gui.DragOperations;
@@ -331,9 +331,9 @@ internal void SetBackground(string url, string bs)
         //    boardContainer.Children.Insert(0, img);        
         //}
 
-        public static bool IsInInvertedZone(double y)
+        public static bool IsInInvertedZone(double y, CardSize size)
         {
-            return y < -Program.GameEngine.Definition.CardSize.Height / 2;
+            return y < -size.Height / 2;
         }
 
         private void CardMoved(object sender, EventArgs e)
@@ -388,7 +388,7 @@ protected override void OnCardOver(object sender, CardsEventArgs e)
             {
                 if (adorner == null || adorner.SourceCard == null || adorner.SourceCard.Card == null) continue;
                 double y = baseY + adorner.SourceCard.Card.Y - baseCard.Y;
-                adorner.OnHoverRequestInverted = IsInInvertedZone(y) ^ Player.LocalPlayer.InvertedTable;
+                adorner.OnHoverRequestInverted = IsInInvertedZone(y, adorner.SourceCard.Card.Size) ^ Player.LocalPlayer.InvertedTable;
             }
         }
 
@@ -415,7 +415,7 @@ protected override void OnCardDropped(object sender, CardsEventArgs e)
                 if (Program.GameSettings.UseTwoSidedTable && (e.ClickedCard.Orientation & CardOrientation.Rot90) != 0)
                 {
                     // We have to offset the position if we cross the middle line
-                    bool newPosInverted = IsInInvertedZone(pt.Y);
+                    bool newPosInverted = IsInInvertedZone(pt.Y, e.ClickedCard.Size);
                     if (cardCtrl != null && (!cardCtrl.IsInverted && newPosInverted))
                     {
 						delta = cardCtrl.Card.RealHeight - cardCtrl.Card.RealWidth;
@@ -486,8 +486,8 @@ protected override void OnCardDropped(object sender, CardsEventArgs e)
                     // If the card is tapped and has crossed the middle line in a two-sided table, we have to adjust its position
                     if (Program.GameSettings.UseTwoSidedTable && (c.Orientation & CardOrientation.Rot90) != 0)
                     {
-                        bool oldPosInverted = IsInInvertedZone(c.Y);
-                        bool newPosInverted = IsInInvertedZone(y);
+                        bool oldPosInverted = IsInInvertedZone(c.Y, c.Size);
+                        bool newPosInverted = IsInInvertedZone(y, c.Size);
                         if (!oldPosInverted && newPosInverted)
                         {
                             delta = c.RealHeight - c.RealWidth;
@@ -1058,7 +1058,7 @@ private static Rect ComputeCardBounds(Card c)
                     !Program.GameSettings.UseTwoSidedTable
                         ? new Rect(c.X, c.Y + h - w, h, w)
                         : // Case 3: rotated card on a 2-sided table, the card is not inversed
-                    !IsInInvertedZone(c.Y)
+                    !IsInInvertedZone(c.Y, c.Size)
                         ? new Rect(c.X, c.Y + h - w, h, w)
                         : // Case 4: rotated and inversed card on a 2-sided table
                     new Rect(c.X - h + w, c.Y, h, w);

recentchanges.txt

@@ -1 +1 @@
-Fixed the transparent click through of images - Kelly
+Fixed some issues with card inversion and custom sizes - Kelly