From 3dc90109c05d99f687d797d422cf679bf48db090 Mon Sep 17 00:00:00 2001 From: Michael Becker Date: Mon, 2 Dec 2019 07:52:36 -0500 Subject: [PATCH] display labels on GenericBrowserButton --- .../Controls/GenericBrowserButton.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs index c12d5c75..6c0c40c0 100644 --- a/CSharp/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs +++ b/CSharp/Libraries/UniversalEditor.UserInterface/Controls/GenericBrowserButton.cs @@ -43,7 +43,7 @@ namespace UniversalEditor.UserInterface.Controls private DefaultTreeModel tm = null; public Collection AvailableObjects { get; } = new Collection(); - public string DefaultText { get; set; } = null; + public string Label { get; set; } = null; private TObj _SelectedObject = default(TObj); public TObj SelectedObject @@ -53,7 +53,7 @@ namespace UniversalEditor.UserInterface.Controls { _SelectedObject = value; - Text = DefaultText; + Text = Label; if (_SelectedObject != null) { TRef _ref = _SelectedObject.MakeReference(); @@ -61,12 +61,21 @@ namespace UniversalEditor.UserInterface.Controls { string[] deets = _ref.GetDetails(); if (deets.Length > 0) - Text = deets[0]; + Text = Label + deets[0]; } } + else + { + ResetLabel(); + } } } + private void ResetLabel() + { + Text = Label + "(not selected)"; + } + private TextBox txtSearch = null; private void initct() @@ -95,6 +104,8 @@ namespace UniversalEditor.UserInterface.Controls protected override void OnCreated (EventArgs e) { base.OnCreated (e); + + ResetLabel(); UpdateSearch (); }