Fixes #474

rds1983 · Sep 19, 2024 · 726e3f2 · 726e3f2
1 parent a0ea73a
commit 726e3f2
Show file tree

Hide file tree

Showing 5 changed files with 104 additions and 33 deletions.
diff --git a/src/Myra/Graphics2D/UI/Selectors/ListView.cs b/src/Myra/Graphics2D/UI/Selectors/ListView.cs
@@ -550,7 +550,7 @@ protected internal override void CopyFrom(Widget w)
 			ListBoxStyle = listView.ListBoxStyle;
 			SelectionMode = listView.SelectionMode;
 
-			foreach(var child in listView.Widgets)
+			foreach (var child in listView.Widgets)
 			{
 				Widgets.Add(child.Clone());
 			}

diff --git a/src/Myra/Graphics2D/UI/Selectors/ListViewButton.cs b/src/Myra/Graphics2D/UI/Selectors/ListViewButton.cs
@@ -2,6 +2,10 @@
 {
 	internal class ListViewButton : ToggleButton
 	{
+		public Widget ButtonsContainer { get; set; }
+		public Widget TopParent => ButtonsContainer ?? Parent;
+
+
 		public ListViewButton() : base(null)
 		{
 		}
@@ -17,14 +21,23 @@ public override bool IsPressed
 					// If this is last pressed button
 					// Don't allow it to be unpressed
 					var allow = false;
-					foreach (var child in Parent.ChildrenCopy)
+					foreach (var child in TopParent.ChildrenCopy)
 					{
 						var asListViewButton = child as ListViewButton;
-						if (asListViewButton == null || asListViewButton == this)
+						if (asListViewButton == this)
 						{
 							continue;
 						}
 
+						if (asListViewButton == null)
+						{
+							asListViewButton = child.FindChild<ListViewButton>();
+							if (asListViewButton == null || asListViewButton == this)
+							{
+								continue;
+							}
+						}
+
 						if (asListViewButton.IsPressed)
 						{
 							allow = true;
@@ -52,15 +65,24 @@ public override void OnPressedChanged()
 			}
 
 			// Release other pressed radio buttons
-			foreach (var child in Parent.ChildrenCopy)
+			foreach (var child in TopParent.ChildrenCopy)
 			{
-				var asRadio = child as ListViewButton;
-				if (asRadio == null || asRadio == this)
+				var asListViewButton = child as ListViewButton;
+				if (asListViewButton == this)
 				{
 					continue;
 				}
 
-				asRadio.IsPressed = false;
+				if (asListViewButton == null)
+				{
+					asListViewButton = child.FindChild<ListViewButton>();
+					if (asListViewButton == null || asListViewButton == this)
+					{
+						continue;
+					}
+				}
+
+				asListViewButton.IsPressed = false;
 			}
 		}
 	}

diff --git a/src/Myra/Graphics2D/UI/Selectors/TabControl.cs b/src/Myra/Graphics2D/UI/Selectors/TabControl.cs
@@ -73,6 +73,9 @@ public TabSelectorPosition TabSelectorPosition
 			}
 		}
 
+		[Category("Behavior")]
+		public bool CloseableTabs { get; set; }
+
 		public TabControl(string styleName = Stylesheet.DefaultStyleName) : base(new Grid())
 		{
 			HorizontalAlignment = HorizontalAlignment.Left;
@@ -227,17 +230,48 @@ protected override void InsertItem(TabItem item, int index)
 				HorizontalAlignment = HorizontalAlignment.Stretch,
 				VerticalAlignment = VerticalAlignment.Stretch,
 				Height = item.Height,
-				Content = panel
+				Content = panel,
+				ButtonsContainer = _gridButtons
 			};
 
 			button.ApplyButtonStyle(TabControlStyle.TabItemStyle);
 
 			button.Click += ButtonOnClick;
 
-			_gridButtons.Widgets.Insert(index, button);
-
 			item.Button = button;
 
+			if (!CloseableTabs)
+			{
+				_gridButtons.Widgets.Insert(index, button);
+			} else
+			{
+				var topItemPanel = new HorizontalStackPanel();
+				topItemPanel.Widgets.Add(button);
+				StackPanel.SetProportionType(button, ProportionType.Fill);
+
+				var closeButton = new Button
+				{
+					Content = new Image(),
+					HorizontalAlignment = HorizontalAlignment.Right
+				};
+
+				closeButton.Click += (s, e) => RemoveItem(item);
+
+				var style = TabControlStyle;
+				if (style.CloseButtonStyle != null)
+				{
+					closeButton.ApplyButtonStyle(style.CloseButtonStyle);
+					if (style.CloseButtonStyle.ImageStyle != null)
+					{
+						var closeImage = (Image)closeButton.Content;
+						closeImage.ApplyPressableImageStyle(style.CloseButtonStyle.ImageStyle);
+					}
+				}
+
+				topItemPanel.Widgets.Add(closeButton);
+				_gridButtons.Widgets.Insert(index, topItemPanel);
+			}
+
 			UpdateButtonsGrid();
 
 			if (Items.Count == 1)
@@ -247,11 +281,32 @@ protected override void InsertItem(TabItem item, int index)
 			}
 		}
 
+		private int GetButtonIndex(ListViewButton button)
+		{
+			var index = -1;
+			for (var i = 0; i < _gridButtons.Widgets.Count; ++i)
+			{
+				var widget = _gridButtons.Widgets[i];
+				if (widget == button || widget.FindChild<ListViewButton>() == button)
+				{
+					index = i;
+					break;
+				}
+			}
+
+			return index;
+		}
+
 		protected override void RemoveItem(TabItem item)
 		{
 			item.Changed -= ItemOnChanged;
 
-			var index = _gridButtons.Widgets.IndexOf(item.Button);
+			var index = GetButtonIndex(item.Button);
+			if (index < 0)
+			{
+				return;
+			}
+
 			_gridButtons.Widgets.RemoveAt(index);
 
 			if (SelectedItem == item)
@@ -287,8 +342,13 @@ protected override void Reset()
 
 		private void ButtonOnClick(object sender, EventArgs eventArgs)
 		{
-			var item = (ListViewButton)sender;
-			var index = _gridButtons.Widgets.IndexOf(item);
+			var button = (ListViewButton)sender;
+			var index = GetButtonIndex(button);
+			if (index < 0)
+			{
+				return;
+			}
+
 			SelectedIndex = index;
 		}
 

diff --git a/src/Myra/Graphics2D/UI/Styles/TabControlStyle.cs b/src/Myra/Graphics2D/UI/Styles/TabControlStyle.cs
@@ -2,30 +2,16 @@
 {
 	public class TabControlStyle : WidgetStyle
 	{
-		public ImageTextButtonStyle TabItemStyle
-		{
-			get; set;
-		}
+		public ImageTextButtonStyle TabItemStyle { get; set; }
 
-		public WidgetStyle ContentStyle
-		{
-			get; set;
-		}
+		public WidgetStyle ContentStyle { get; set; }
 
-		public int ButtonSpacing
-		{
-			get; set;
-		}
+		public int ButtonSpacing { get; set; }
 
-		public int HeaderSpacing
-		{
-			get; set;
-		}
+		public int HeaderSpacing { get; set; }
 
-		public TabSelectorPosition TabSelectorPosition
-		{
-			get; set;
-		}
+		public TabSelectorPosition TabSelectorPosition { get; set; }
+		public ImageButtonStyle CloseButtonStyle { get; set; }
 
 		public TabControlStyle()
 		{

diff --git a/src/Myra/Resources/default_ui_skin.xmms b/src/Myra/Resources/default_ui_skin.xmms
@@ -98,6 +98,9 @@
 				<LabelStyle Font="default-font" TextColor="white" DisabledTextColor="gray" />
 			</TabItemStyle>
 			<ContentStyle Background="window" Padding="5" />
+			<CloseButtonStyle OverBackground="button-over" Padding="5, 0" PressedBackground="button-red">
+				<ImageStyle Image="icon-close" />
+			</CloseButtonStyle>
 		</TabControlStyle>
 	</TabControlStyles>
 	<TreeStyles>