[Gtk] Adds EditingFinished event to cell renderers

mono · Jan 25, 2019 · 2df379b · 2df379b
1 parent 0bb3624
commit 2df379b
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 8 deletions.
diff --git a/TestApps/Samples/Samples/ListViewCombos.cs b/TestApps/Samples/Samples/ListViewCombos.cs
@@ -25,28 +25,33 @@
 // THE SOFTWARE.
 using System;
 using Xwt;
+using System.Linq;
 
 namespace Samples
 {
 	public class ListViewCombos: VBox
 	{
+		ListStore store;
+		ListView list;
+		DataField<int> indexField;
 		public ListViewCombos ()
 		{
-			ListView list = new ListView ();
-			var indexField = new DataField<int> ();
-
+			list = new ListView ();
+			indexField = new DataField<int> ();
 			var indexField2 = new DataField<int> ();
 			var itemsField = new DataField<ItemCollection> ();
 
-			ListStore store = new ListStore (indexField, indexField2, itemsField);
+			store = new ListStore (indexField, indexField2, itemsField);
 			list.DataSource = store;
 			list.GridLinesVisible = GridLines.Horizontal;
 
-			var comboCellView = new ComboBoxCellView { Editable = true, SelectedIndexField = indexField };
+			ComboBoxCellView comboCellView = new ComboBoxCellView { Editable = true, SelectedIndexField = indexField };
 			comboCellView.Items.Add (1, "one");
 			comboCellView.Items.Add (2, "two");
 			comboCellView.Items.Add (3, "three");
 
+			comboCellView.EditingFinished += ComboCellView_EditingFinished;
+
 			list.Columns.Add (new ListViewColumn ("List 1", comboCellView));
 
 			var comboCellView2 = new ComboBoxCellView { Editable = true, SelectedIndexField = indexField2, ItemsField = itemsField };
@@ -65,5 +70,13 @@ public ListViewCombos ()
 			}
 			PackStart (list, true);
 		}
+
+		void ComboCellView_EditingFinished (object sender, EventArgs e)
+		{
+			var cellView = (ComboBoxCellView)sender;
+		    var cellText = store.GetValue (list.SelectedRow, indexField);
+
+			Console.WriteLine ($"Your real value is : {cellText}");
+		}
 	}
 }
diff --git a/Xwt.Gtk/Xwt.GtkBackend.CellViews/CustomCellRendererComboBox.cs b/Xwt.Gtk/Xwt.GtkBackend.CellViews/CustomCellRendererComboBox.cs
@@ -129,6 +129,8 @@ void HandleEdited (object o, Gtk.EditedArgs args)
 				}
 				if (view.SelectedTextField != null)
 					CellUtil.SetModelValue (TreeModel, CurrentIter, view.SelectedTextField.Index, typeof (string), args.NewText);
+
+				view.RaiseEditingFinished ();
 			}
 		}
 	}

diff --git a/Xwt.Gtk/Xwt.GtkBackend.CellViews/CustomCellRendererText.cs b/Xwt.Gtk/Xwt.GtkBackend.CellViews/CustomCellRendererText.cs
@@ -72,6 +72,7 @@ void HandleEdited (object o, EditedArgs args)
 				Gtk.TreeIter iter;
 				if (TreeModel.GetIterFromString (out iter, args.Path))
 					CellUtil.SetModelValue (TreeModel, iter, view.TextField.Index, view.TextField.FieldType, args.NewText);
+				view.RaiseEditingFinished ();
 			}
 		}
 	}

diff --git a/Xwt.Gtk/Xwt.GtkBackend.CellViews/CustomCellRendererToggle.cs b/Xwt.Gtk/Xwt.GtkBackend.CellViews/CustomCellRendererToggle.cs
@@ -91,6 +91,8 @@ void HandleToggled (object o, ToggledArgs args)
 
 					CellUtil.SetModelValue (TreeModel, iter, field.Index, type, newValue);
 				}
+
+				view.RaiseEditingFinished ();
 			}
 		}
 	}

diff --git a/Xwt/Xwt.Backends/IComboBoxCellViewFrontend.cs b/Xwt/Xwt.Backends/IComboBoxCellViewFrontend.cs
@@ -27,7 +27,12 @@
 
 namespace Xwt.Backends
 {
-	public interface IComboBoxCellViewFrontend: ICellViewFrontend
+	public interface IEditableCellViewFrontend
+	{
+		void RaiseEditingFinished ();
+	}
+
+	public interface IComboBoxCellViewFrontend: ICellViewFrontend, IEditableCellViewFrontend
 	{
 		IDataField<string> SelectedTextField { get; }
 		IDataField<int> SelectedIndexField { get; }

diff --git a/Xwt/Xwt.Backends/ITextCellViewFrontend.cs b/Xwt/Xwt.Backends/ITextCellViewFrontend.cs
@@ -27,7 +27,7 @@
 
 namespace Xwt.Backends
 {
-	public interface ITextCellViewFrontend: ICellViewFrontend
+	public interface ITextCellViewFrontend: ICellViewFrontend, IEditableCellViewFrontend
 	{
 		string Markup { get; }
 		string Text { get; }

diff --git a/Xwt/Xwt.Backends/IToggleCellViewFrontend.cs b/Xwt/Xwt.Backends/IToggleCellViewFrontend.cs
@@ -27,7 +27,7 @@
 namespace Xwt.Backends
 {
 
-	public interface IToggleCellViewFrontend : ICellViewFrontend
+	public interface IToggleCellViewFrontend : ICellViewFrontend, IEditableCellViewFrontend
 	{
 		bool Active { get; }
 		bool Editable { get; }

diff --git a/Xwt/Xwt/CheckBoxCellView.cs b/Xwt/Xwt/CheckBoxCellView.cs
@@ -101,6 +101,7 @@ public bool AllowMixed {
 		}
 
 		public event EventHandler<WidgetEventArgs> Toggled;
+		public event EventHandler EditingFinished;
 
 		/// <summary>
 		/// Raises the toggled event
@@ -115,5 +116,10 @@ public bool RaiseToggled ()
 			}
 			return false;
 		}
+
+		public void RaiseEditingFinished ()
+		{
+			EditingFinished?.Invoke (this, EventArgs.Empty);
+		}
 	}
 }
diff --git a/Xwt/Xwt/ComboBoxCellView.cs b/Xwt/Xwt/ComboBoxCellView.cs
@@ -124,5 +124,12 @@ public bool RaiseSelectionChanged ()
 			}
 			return false;
 		}
+
+		public event EventHandler EditingFinished;
+
+		public void RaiseEditingFinished ()
+		{
+			EditingFinished?.Invoke (this, EventArgs.Empty);
+		}
 	}
 }
diff --git a/Xwt/Xwt/RadioButtonCellView.cs b/Xwt/Xwt/RadioButtonCellView.cs
@@ -79,5 +79,12 @@ public bool RaiseToggled ()
 			}
 			return false;
 		}
+
+		public event EventHandler EditingFinished;
+
+		public void RaiseEditingFinished ()
+		{
+			EditingFinished?.Invoke (this, EventArgs.Empty);
+		}
 	}
 }
diff --git a/Xwt/Xwt/TextCellView.cs b/Xwt/Xwt/TextCellView.cs
@@ -116,5 +116,12 @@ bool ITextCellViewFrontend.RaiseTextChanged (string newText)
 			}
 			return false;
 		}
+
+		public event EventHandler EditingFinished;
+
+		public void RaiseEditingFinished ()
+		{
+			EditingFinished?.Invoke (this, EventArgs.Empty);
+		}
 	}
 }