[Gtk] Adds EditingFinished event to cell renderers

TestApps/Samples/Samples/ListView2.cs

@@ -20,8 +20,8 @@ public ListView2 ()
 			list.DataSource = store;
 			list.GridLinesVisible = GridLines.Horizontal;
 
-			var checkCellView = new CheckBoxCellView { Editable = true, ActiveField = editableActiveField };
-			checkCellView.Toggled += (sender, e) => {
+			var cellView = new CheckBoxCellView { Editable = true, ActiveField = editableActiveField };
+			cellView.Toggled += (sender, e) => {
 
 				if (list.CurrentEventRow == null) {
 					MessageDialog.ShowError("CurrentEventRow is null. This is not supposed to happen");
@@ -30,12 +30,24 @@ public ListView2 ()
 					store.SetValue(list.CurrentEventRow, textField, "Toggled");
 				}
 			};
+			cellView.EditingFinished += CellView_EditingFinished;
+
+			list.Columns.Add (new ListViewColumn("Editable", cellView));
 
-			list.Columns.Add (new ListViewColumn("Editable", checkCellView));
 			list.Columns.Add (new ListViewColumn("Not Editable", new CheckBoxCellView { Editable = false, ActiveField = nonEditableActiveField }));
-			list.Columns.Add (new ListViewColumn("Editable", new TextCellView { Editable = true, TextField = textField }));
-			list.Columns.Add(new ListViewColumn("Somewhat Editable", new CheckBoxCellView { EditableField = editableField, ActiveField = somewhatEditableData }));
-			list.Columns.Add (new ListViewColumn("Somewhat Editable", new TextCellView { EditableField = editableField, TextField = textField2 }));
+
+			Xwt.Backends.IEditableCellViewFrontend<string> stringCellView = new TextCellView { Editable = true, TextField = textField };
+			stringCellView.EditingFinished += CellView_EditingFinished;
+			list.Columns.Add (new ListViewColumn("Editable",(CellView) stringCellView));
+
+			cellView = new CheckBoxCellView { EditableField = editableField, ActiveField = somewhatEditableData };
+			cellView.EditingFinished += CellView_EditingFinished;
+			list.Columns.Add(new ListViewColumn("Somewhat Editable",(CellView) cellView));
+
+			stringCellView = new TextCellView { EditableField = editableField, TextField = textField2 };
+			stringCellView.EditingFinished += CellView_EditingFinished;
+
+			list.Columns.Add (new ListViewColumn("Somewhat Editable", (CellView)stringCellView));
 
 			Random rand = new Random ();
 
@@ -51,6 +63,16 @@ public ListView2 ()
 			}
 			PackStart (list, true);
 		}
+
+		void CellView_EditingFinished(object sender, Xwt.CellEditingFinishedArgs<Xwt.CheckBoxState> e)
+		{
+			Console.WriteLine("Your old value was '{0}' and now is '{1}'", e.OldValue, e.NewValue);
+		}
+
+		void CellView_EditingFinished(object sender, Xwt.CellEditingFinishedArgs<string> e)
+		{
+			Console.WriteLine("Your old value was '{0}' and now is '{1}'", e.OldValue, e.NewValue);
+		}
 	}
 }
 

TestApps/Samples/Samples/ListViewCombos.cs

@@ -25,31 +25,35 @@
 // 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 += CellView_EditingFinished;
 			list.Columns.Add (new ListViewColumn ("List 1", comboCellView));
 
 			var comboCellView2 = new ComboBoxCellView { Editable = true, SelectedIndexField = indexField2, ItemsField = itemsField };
+			comboCellView2.EditingFinished += CellView_EditingFinished;
 			list.Columns.Add (new ListViewColumn ("List 2", comboCellView2));
 
 			int p = 0;
@@ -65,5 +69,15 @@ public ListViewCombos ()
 			}
 			PackStart (list, true);
 		}
+
+		void CellView_EditingFinished (object sender, CellEditingFinishedArgs<CheckBoxState> e)
+		{
+			Console.WriteLine("Your old value was '{0}' and now is '{1}'", e.OldValue, e.NewValue);
+		}
+
+		void CellView_EditingFinished(object sender, CellEditingFinishedArgs<string> e)
+		{
+			Console.WriteLine("Your old value was '{0}' and now is '{1}'", e.OldValue, e.NewValue);
+		}
 	}
 }

TestApps/Samples/Samples/TreeViews.cs

@@ -54,6 +54,7 @@ public TreeViews ()
 					store.GetNavigatorAt(view.CurrentEventRow).SetValue(text, "TriState Toggled");
 				}
 			};
+			triStateCellView.EditingFinished += CellView_EditingFinished;
 			var checkCellView = new CheckBoxCellView (check) { Editable = true };
 			checkCellView.Toggled += (object sender, WidgetEventArgs e) => {
 				if (view.CurrentEventRow == null) {
@@ -63,6 +64,7 @@ public TreeViews ()
 					store.GetNavigatorAt(view.CurrentEventRow).SetValue(text, "Toggled " + checkCellView.Active);
 				}
 			};
+			checkCellView.EditingFinished += CellView_EditingFinished;
 			var optionCellView1 = new RadioButtonCellView (option1) { Editable = true };
 			optionCellView1.Toggled += (object sender, WidgetEventArgs e) => {
 				if (view.CurrentEventRow == null) {
@@ -71,6 +73,8 @@ public TreeViews ()
 					store.GetNavigatorAt (view.CurrentEventRow).SetValue (option2, optionCellView1.Active);
 				}
 			};
+			optionCellView1.EditingFinished += CellView_EditingFinished;
+
 			var optionCellView2 = new RadioButtonCellView (option2) { Editable = true };
 			optionCellView2.Toggled += (object sender, WidgetEventArgs e) => {
 				if (view.CurrentEventRow == null) {
@@ -79,6 +83,7 @@ public TreeViews ()
 					store.GetNavigatorAt (view.CurrentEventRow).SetValue (option1, optionCellView2.Active);
 				}
 			};
+			optionCellView2.EditingFinished += CellView_EditingFinished;
 
 			TreePosition initialActive = null;
 			var optionCellView3 = new RadioButtonCellView (option3) { Editable = true };
@@ -91,7 +96,7 @@ public TreeViews ()
 					initialActive = view.CurrentEventRow;
 				}
 			};
-
+			optionCellView3.EditingFinished += CellView_EditingFinished;
 			view.Columns.Add ("TriCheck", triStateCellView);
 			view.Columns.Add ("Check", checkCellView);
 			view.Columns.Add ("Radio", optionCellView1, optionCellView2, optionCellView3);
@@ -230,6 +235,21 @@ public TreeViews ()
 			view.RowExpanded += (sender, e) => label.Text = "Row expanded: " + store.GetNavigatorAt (e.Position).GetValue (text);
 		}
 
+		void CellView_EditingFinished(object sender, Xwt.CellEditingFinishedArgs<Xwt.CheckBoxState> e)
+		{
+			Console.WriteLine("Your old value was '{0}' and now is '{1}'", e.OldValue, e.NewValue);
+		}
+
+		void CellView_EditingFinished(object sender, Xwt.CellEditingFinishedArgs<bool> e)
+		{
+			Console.WriteLine("Your old value was '{0}' and now is '{1}'", e.OldValue, e.NewValue);
+		}
+
+		void CellView_EditingFinished(object sender, Xwt.CellEditingFinishedArgs<string> e)
+		{
+			Console.WriteLine("Your old value was '{0}' and now is '{1}'", e.OldValue, e.NewValue);
+		}
+
 		void HandleDragOver (object sender, DragOverEventArgs e)
 		{
 			e.AllowedAction = e.Action;

Xwt.Gtk/Xwt.GtkBackend.CellViews/CustomCellRendererComboBox.cs

@@ -76,7 +76,7 @@ public CustomCellRendererComboBox ()
 		protected override void OnLoadData ()
 		{
 			var view = (IComboBoxCellViewFrontend)Frontend;
-			renderer.Text = view.SelectedText;
+			lastValue = renderer.Text = view.SelectedText;
 			var source = view.ItemsSource;
 			renderer.Model = GetListModel (source).Store;
 			renderer.TextColumn = 0;
@@ -102,6 +102,8 @@ void CleanCache ()
 			modelCache = newModel;
 		}
 
+		string lastValue = string.Empty;
+
 		void HandleEdited (object o, Gtk.EditedArgs args)
 		{
 			Gtk.TreeIter iter;
@@ -129,6 +131,9 @@ void HandleEdited (object o, Gtk.EditedArgs args)
 				}
 				if (view.SelectedTextField != null)
 					CellUtil.SetModelValue (TreeModel, CurrentIter, view.SelectedTextField.Index, typeof (string), args.NewText);
+
+				view.RaiseEditingFinished (new CellEditingFinishedArgs<string> (lastValue, args.NewText));
+				lastValue = args.NewText;
 			}
 		}
 	}

Xwt.Gtk/Xwt.GtkBackend.CellViews/CustomCellRendererText.cs

@@ -40,6 +40,8 @@ public CustomCellRendererText ()
 			cellRenderer.Edited += HandleEdited;
 		}
 
+		string lastValue;
+
 		protected override void OnLoadData ()
 		{
 			var view = (ITextCellViewFrontend) Frontend;
@@ -57,6 +59,7 @@ protected override void OnLoadData ()
 				if (mixedMarkupText)
 					cellRenderer.Attributes = new Pango.AttrList ();
 			}
+			lastValue = cellRenderer.Text;
 			cellRenderer.Editable = view.Editable;
 			if (!cellRenderer.Editable)
 				cellRenderer.Mode = CellRendererMode.Activatable;
@@ -72,6 +75,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 (new CellEditingFinishedArgs<string> (lastValue, args.NewText));
 			}
 		}
 	}

Xwt.Gtk/Xwt.GtkBackend.CellViews/CustomCellRendererToggle.cs

@@ -58,6 +58,8 @@ protected override void OnLoadData ()
 			}
 		}
 
+		CheckBoxState lastValue;
+
 		void HandleToggled (object o, ToggledArgs args)
 		{
 			SetCurrentEventRow ();
@@ -90,6 +92,21 @@ void HandleToggled (object o, ToggledArgs args)
 						(object) newState : (object) (newState == CheckBoxState.On);
 
 					CellUtil.SetModelValue (TreeModel, iter, field.Index, type, newValue);
+
+					if (view is ICheckBoxCellViewFrontend) {
+						((ICheckBoxCellViewFrontend)view).RaiseEditingFinished(new CellEditingFinishedArgs<CheckBoxState>(lastValue, newState));
+					} else if (view is IRadioButtonCellViewFrontend) {
+						((IRadioButtonCellViewFrontend)view).RaiseEditingFinished(new CellEditingFinishedArgs<bool>(lastValue == CheckBoxState.On, newState == CheckBoxState.On));
+					}
+
+					lastValue = newState;
+					return;
+				}
+
+				if (view is ICheckBoxCellViewFrontend) {
+					((ICheckBoxCellViewFrontend)view).RaiseEditingFinished(new CellEditingFinishedArgs<CheckBoxState>(lastValue, lastValue));
+				} else if (view is IRadioButtonCellViewFrontend) {
+					((IRadioButtonCellViewFrontend)view).RaiseEditingFinished(new CellEditingFinishedArgs<bool>(lastValue == CheckBoxState.On, lastValue == CheckBoxState.On));
 				}
 			}
 		}

Xwt/Xwt.Backends/ICheckBoxCellViewFrontend.cs

@@ -27,7 +27,7 @@
 
 namespace Xwt.Backends
 {
-	public interface ICheckBoxCellViewFrontend: IToggleCellViewFrontend
+	public interface ICheckBoxCellViewFrontend: IToggleCellViewFrontend, IEditableCellViewFrontend<CheckBoxState>
 	{
 		CheckBoxState State { get; }
 		bool AllowMixed { get; }

Xwt/Xwt.Backends/IComboBoxCellViewFrontend.cs

@@ -27,7 +27,13 @@
 
 namespace Xwt.Backends
 {
-	public interface IComboBoxCellViewFrontend: ICellViewFrontend
+	public interface IEditableCellViewFrontend<T>
+	{
+		event EventHandler<CellEditingFinishedArgs<T>> EditingFinished;
+		void RaiseEditingFinished (CellEditingFinishedArgs<T> args);
+	}
+
+	public interface IComboBoxCellViewFrontend: ICellViewFrontend, IEditableCellViewFrontend<string>
 	{
 		IDataField<string> SelectedTextField { get; }
 		IDataField<int> SelectedIndexField { get; }

Xwt/Xwt.Backends/IRadioButtonCellViewFrontend.cs

@@ -26,7 +26,7 @@
 
 namespace Xwt.Backends
 {
-	public interface IRadioButtonCellViewFrontend: IToggleCellViewFrontend
+	public interface IRadioButtonCellViewFrontend: IToggleCellViewFrontend, IEditableCellViewFrontend<bool>
 	{
 	}
 }

Xwt/Xwt.Backends/ITextCellViewFrontend.cs

@@ -27,7 +27,7 @@
 
 namespace Xwt.Backends
 {
-	public interface ITextCellViewFrontend: ICellViewFrontend
+	public interface ITextCellViewFrontend: ICellViewFrontend, IEditableCellViewFrontend<string>
 	{
 		string Markup { get; }
 		string Text { get; }

Xwt/Xwt.Backends/IToggleCellViewFrontend.cs

@@ -26,7 +26,6 @@
 
 namespace Xwt.Backends
 {
-
 	public interface IToggleCellViewFrontend : ICellViewFrontend
 	{
 		bool Active { get; }

Xwt/Xwt/CellEditingFinishedArgs.cs

@@ -0,0 +1,41 @@
+//
+// IComboBoxCellViewFrontend.cs
+//
+// Author:
+//       Lluis Sanchez Gual <[email protected]>
+//
+// Copyright (c) 2016 Xamarin, Inc (http://www.xamarin.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace Xwt
+{
+	public class CellEditingFinishedArgs<T> : EventArgs
+	{
+		public CellEditingFinishedArgs(T oldValue, T newValue)
+		{
+			OldValue = oldValue;
+			NewValue = newValue;
+		}
+
+		public T OldValue { get; set; }
+		public T NewValue { get; set; }
+	}
+}

Xwt/Xwt/CheckBoxCellView.cs

@@ -101,6 +101,7 @@ public bool AllowMixed {
 		}
 
 		public event EventHandler<WidgetEventArgs> Toggled;
+		public event EventHandler<CellEditingFinishedArgs<CheckBoxState>> EditingFinished;
 
 		/// <summary>
 		/// Raises the toggled event
@@ -115,5 +116,10 @@ public bool RaiseToggled ()
 			}
 			return false;
 		}
+
+		public void RaiseEditingFinished (CellEditingFinishedArgs<CheckBoxState> args)
+		{
+			EditingFinished?.Invoke (this, args);
+		}
 	}
 }

Xwt/Xwt/ComboBoxCellView.cs

@@ -124,5 +124,12 @@ public bool RaiseSelectionChanged ()
 			}
 			return false;
 		}
+
+		public event EventHandler<CellEditingFinishedArgs<string>> EditingFinished;
+
+		public void RaiseEditingFinished (CellEditingFinishedArgs<string> args)
+		{
+			EditingFinished?.Invoke (this, args);
+		}
 	}
 }

Xwt/Xwt/RadioButtonCellView.cs

@@ -79,5 +79,12 @@ public bool RaiseToggled ()
 			}
 			return false;
 		}
+
+		public event EventHandler<CellEditingFinishedArgs<bool>> EditingFinished;
+
+		public void RaiseEditingFinished (CellEditingFinishedArgs<bool> args)
+		{
+			EditingFinished?.Invoke (this, args);
+		}
 	}
 }