zoom option works correctly (even with frames)

This commit is contained in:
Ulf
2013-06-17 00:38:58 +02:00
parent 3a1a98d286
commit 4ef3dc4ea6
3 changed files with 10 additions and 9 deletions

View File

@@ -40,15 +40,15 @@ namespace PreviewToy
this.overlay = new PreviewOverlay(this); 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.render_area.MouseHover += new System.EventHandler(this.preview_MouseHover);
this.overlay.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.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.render_area.MouseLeave += new System.EventHandler(this.preview_MouseLeave);
this.overlay.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.overlay_area.MouseLeave += new System.EventHandler(this.preview_MouseLeave);
old_size = this.Size; old_size = this.Size;
@@ -60,6 +60,7 @@ namespace PreviewToy
{ {
if (!mouse_over_lock) if (!mouse_over_lock)
{ {
mouse_over_lock = true;
if (hover_zoom) if (hover_zoom)
{ {
old_size = Size; old_size = Size;
@@ -68,7 +69,7 @@ namespace PreviewToy
} }
TopMost = true; TopMost = true;
overlay.TopMost = true; overlay.TopMost = true;
mouse_over_lock = true;
} }
RefreshPreview(); RefreshPreview();
} }
@@ -90,7 +91,7 @@ namespace PreviewToy
{ {
RefreshPreview(); RefreshPreview();
base.OnResize(e); base.OnResize(e);
if (has_been_set_up) if (has_been_set_up && !mouse_over_lock)
{ {
this.spawner.syncronize_preview_size(this.Size); this.spawner.syncronize_preview_size(this.Size);
} }

View File

@@ -28,7 +28,7 @@
<UpdateRequired>false</UpdateRequired> <UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions> <MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.7.0.0</ApplicationVersion> <ApplicationVersion>1.8.0.0</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust> <UseApplicationTrust>false</UseApplicationTrust>
<PublishWizardCompleted>true</PublishWizardCompleted> <PublishWizardCompleted>true</PublishWizardCompleted>
<BootstrapperEnabled>true</BootstrapperEnabled> <BootstrapperEnabled>true</BootstrapperEnabled>

Binary file not shown.