From 4ef3dc4ea60e007f46796dcb1041aea2215b5f13 Mon Sep 17 00:00:00 2001 From: Ulf Date: Mon, 17 Jun 2013 00:38:58 +0200 Subject: [PATCH] zoom option works correctly (even with frames) --- Preview.cs | 17 +++++++++-------- preview toy.csproj | 2 +- preview toy.v11.suo | Bin 107520 -> 85504 bytes 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Preview.cs b/Preview.cs index 8b509a6..36bfdb9 100644 --- a/Preview.cs +++ b/Preview.cs @@ -40,15 +40,15 @@ namespace PreviewToy this.overlay = new PreviewOverlay(this); - this.MouseHover += new System.EventHandler(this.preview_MouseHover); +// this.MouseHover += new System.EventHandler(this.preview_MouseHover); this.render_area.MouseHover += new System.EventHandler(this.preview_MouseHover); - this.overlay.MouseHover += new System.EventHandler(this.preview_MouseHover); - this.overlay.overlay_area.MouseHover += new System.EventHandler(this.preview_MouseHover); +// this.overlay.MouseHover += new System.EventHandler(this.preview_MouseHover); +// this.overlay.overlay_area.MouseHover += new System.EventHandler(this.preview_MouseHover); - this.MouseLeave += new System.EventHandler(this.preview_MouseLeave); +// this.MouseLeave += new System.EventHandler(this.preview_MouseLeave); this.render_area.MouseLeave += new System.EventHandler(this.preview_MouseLeave); - this.overlay.MouseLeave += new System.EventHandler(this.preview_MouseLeave); - this.overlay.overlay_area.MouseLeave += new System.EventHandler(this.preview_MouseLeave); +// this.overlay.MouseLeave += new System.EventHandler(this.preview_MouseLeave); +// this.overlay.overlay_area.MouseLeave += new System.EventHandler(this.preview_MouseLeave); old_size = this.Size; @@ -60,6 +60,7 @@ namespace PreviewToy { if (!mouse_over_lock) { + mouse_over_lock = true; if (hover_zoom) { old_size = Size; @@ -68,7 +69,7 @@ namespace PreviewToy } TopMost = true; overlay.TopMost = true; - mouse_over_lock = true; + } RefreshPreview(); } @@ -90,7 +91,7 @@ namespace PreviewToy { RefreshPreview(); base.OnResize(e); - if (has_been_set_up) + if (has_been_set_up && !mouse_over_lock) { this.spawner.syncronize_preview_size(this.Size); } diff --git a/preview toy.csproj b/preview toy.csproj index e02a8dd..2462e00 100644 --- a/preview toy.csproj +++ b/preview toy.csproj @@ -28,7 +28,7 @@ false true 0 - 1.7.0.0 + 1.8.0.0 false true true diff --git a/preview toy.v11.suo b/preview toy.v11.suo index 9f86db8b7c279f7404dec5333bea418cbbb8e6d0..87d063da4fba283f9bd95d294be6e16c49c5fb3a 100644 GIT binary patch delta 3847 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