From 2d560f45c08c659bf5dfefc6f07808aea0bfa2f0 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 19 Dec 2017 17:06:33 -0800 Subject: [PATCH] Rename BeforeShowPopup to OnBeforePopup & use standard event pattern --- PartPreviewWindow/PopupButton.cs | 6 ++++-- PartPreviewWindow/PopupMenuButton.cs | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/PartPreviewWindow/PopupButton.cs b/PartPreviewWindow/PopupButton.cs index b389f20a6..a94220078 100644 --- a/PartPreviewWindow/PopupButton.cs +++ b/PartPreviewWindow/PopupButton.cs @@ -38,6 +38,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow private static readonly Color slightShade = new Color(0, 0, 0, 40); public event EventHandler PopupWindowClosed; + public event EventHandler BeforePopup; private GuiWidget buttonView; private bool menuVisibileAtMouseDown = false; @@ -113,7 +114,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow return; } - this.BeforeShowPopup(); + this.OnBeforePopup(); popupWidget = new PopupWidget(this.PopupContent, PopupLayoutEngine, MakeScrollable) { @@ -133,8 +134,9 @@ namespace MatterHackers.MatterControl.PartPreviewWindow popupWidget.Focus(); } - protected virtual void BeforeShowPopup() + protected virtual void OnBeforePopup() { + this.BeforePopup?.Invoke(this, null); } } } \ No newline at end of file diff --git a/PartPreviewWindow/PopupMenuButton.cs b/PartPreviewWindow/PopupMenuButton.cs index a7f29cc77..4d1bceaa0 100644 --- a/PartPreviewWindow/PopupMenuButton.cs +++ b/PartPreviewWindow/PopupMenuButton.cs @@ -71,12 +71,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow } } - protected override void BeforeShowPopup() + protected override void OnBeforePopup() { if (this.PopupContent.BackgroundColor == Color.Transparent) { this.PopupContent.BackgroundColor = Color.White; } + + base.OnBeforePopup(); } } } \ No newline at end of file