サーフェスビューワv3の判定領域計算でゼロオリジン関係が考慮できてないのを修正

kanadelab · Jan 29, 2024 · faf0a71 · faf0a71
1 parent 1619528
commit faf0a71
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/Satolist2/Control/RuntimeBasedSurfaceViewer.xaml.cs b/Satolist2/Control/RuntimeBasedSurfaceViewer.xaml.cs
@@ -133,12 +133,14 @@ public enum CollisionType
 		public string DockingContentId => ContentId;
 
 		//サーフェスの基準サイズ
-		private System.Drawing.Size SelectedSurfaceBaseSize
+		public System.Drawing.Size SelectedSurfaceBaseSize
 		{
 			get
 			{
+				if (selectedSurface == null)
+					return default;
 				var windowItem = windowItems[selectedSurface.Scope];
-				return windowItem.CurrentSurfaceSizeData.ZeroOriginSize;
+				return windowItem.CurrentSurfaceSizeData?.ZeroOriginSize ?? default;
 			}
 		}
 
@@ -185,6 +187,7 @@ public RuntimeBasedSurfaceViewerItemViewModel SelectedSurface
 				{
 					selectedSurface = value;
 					NotifyChangeSurface();
+					NotifyChanged(nameof(SelectedSurfaceBaseSize));
 				}
 			}
 		}
@@ -772,6 +775,9 @@ private void OnMetadataGenerated(int msg, IntPtr wparam, IntPtr lparam)
 						{
 							var sizeData = new SurfaceSizeData(surfaceBitmap.Size, surfaceZeroBitmap.Size);
 							windowItems[surface.Scope].SetSurfaceImageSize(generatingSurfaceId, sizeData);
+
+							//ちょっと不自然だがここで交信かけてやる
+							NotifyChanged(nameof(SelectedSurfaceBaseSize));
 						}
 					}