From 1b5f1daed199b2ef7f7143437db67898eb5051e5 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Wed, 10 Jan 2018 23:21:46 -0800 Subject: [PATCH] Add reusable SearchButton helper --- ApplicationView/ThemeConfig.cs | 9 +++++++++ Library/Widgets/PrintLibraryWidget.cs | 8 ++------ PartPreviewWindow/SelectedObjectPanel.cs | 1 + 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/ApplicationView/ThemeConfig.cs b/ApplicationView/ThemeConfig.cs index fc6f227bc..8ff4e8302 100644 --- a/ApplicationView/ThemeConfig.cs +++ b/ApplicationView/ThemeConfig.cs @@ -37,6 +37,7 @@ namespace MatterHackers.MatterControl using Agg.Image; using CustomWidgets; using MatterHackers.Agg.Platform; + using MatterHackers.Localizations; using MatterHackers.MatterControl.PartPreviewWindow; using MatterHackers.VectorMath; @@ -122,6 +123,14 @@ namespace MatterHackers.MatterControl public int OverlayAlpha { get; set; } = 50; + public GuiWidget CreateSearchButton() + { + return new IconButton(AggContext.StaticData.LoadIcon("icon_search_24x24.png", 16, 16, IconColor.Theme), this) + { + ToolTipText = "Search".Localize(), + }; + } + public Color InteractionLayerOverlayColor { get; private set; } private EventHandler unregisterEvents; diff --git a/Library/Widgets/PrintLibraryWidget.cs b/Library/Widgets/PrintLibraryWidget.cs index 54d057a9a..2c9696bb9 100644 --- a/Library/Widgets/PrintLibraryWidget.cs +++ b/Library/Widgets/PrintLibraryWidget.cs @@ -138,12 +138,8 @@ namespace MatterHackers.MatterControl.PrintLibrary navBar.AddChild(searchPanel); - var searchButton = new IconButton(AggContext.StaticData.LoadIcon("icon_search_24x24.png", 16, 16, IconColor.Theme), theme) - { - ToolTipText = "Search".Localize(), - Name = "Search Library Button", - }; - searchButton.VisibleChanged += (s, e) => Console.WriteLine(); + var searchButton = ApplicationController.Instance.Theme.CreateSearchButton(); + searchButton.Name = "Search Library Button"; searchButton.Click += (s, e) => { if (searchPanel.Visible) diff --git a/PartPreviewWindow/SelectedObjectPanel.cs b/PartPreviewWindow/SelectedObjectPanel.cs index 5f81d0e52..7a7da90d3 100644 --- a/PartPreviewWindow/SelectedObjectPanel.cs +++ b/PartPreviewWindow/SelectedObjectPanel.cs @@ -335,6 +335,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var editorWidget = editor.Create(scene.SelectedItem, view3DWidget, theme); editorWidget.HAnchor = HAnchor.Stretch; editorWidget.VAnchor = VAnchor.Fit; + editorWidget.Padding = 0; editorPanel.AddChild(editorWidget); }