Merge pull request #8851 from mono/master-vsts810342

Fixes VSTS Bug 810342: Accessibility: Version Control - Log: Voice
mono · Oct 31, 2019 · 853f0aa · 853f0aa
2 parents 246aedb + 48f8a1d
commit 853f0aa
Show file tree

Hide file tree

Showing 6 changed files with 793 additions and 124 deletions.
diff --git a/...rsionControl/MonoDevelop.VersionControl/Gui/MonoDevelop.VersionControl.Views.LogWidget.cs b/...rsionControl/MonoDevelop.VersionControl/Gui/MonoDevelop.VersionControl.Views.LogWidget.cs
@@ -1,5 +1,7 @@
 #pragma warning disable 436
 // This file has been generated by the GUI designer. Do not modify.
+using Gtk;
+
 namespace MonoDevelop.VersionControl.Views
 {
 	public partial class LogWidget
@@ -25,7 +27,12 @@ public partial class LogWidget
 		private global::Gtk.ScrolledWindow scrolledwindow1;
 		private global::Gtk.TextView textviewDetails;
 		private global::Gtk.ScrolledWindow scrolledwindowFiles;
-
+		private global::Gtk.ScrolledWindow scrolledwindowFileContents = new ScrolledWindow ();
+		Label labelFilePathName = new Gtk.Label ();
+
+		private HPaned fileHPaned;
+		private VBox vboxFileContents;
+
 		protected virtual void Build ()
 		{
 			MonoDevelop.Components.Gui.Initialize (this);
@@ -178,7 +185,17 @@ protected virtual void Build ()
 			this.scrolledwindowFiles = new global::Gtk.ScrolledWindow ();
 			this.scrolledwindowFiles.CanFocus = true;
 			this.scrolledwindowFiles.Name = "scrolledwindowFiles";
-			this.vpaned1.Add (this.scrolledwindowFiles);
+			this.fileHPaned = new HPaned ();
+			this.fileHPaned.Position = 333;
+
+			fileHPaned.Add (this.scrolledwindowFiles);
+			vboxFileContents = new VBox ();
+			labelFilePathName.Xalign = 0f;
+			vboxFileContents.PackStart (labelFilePathName, false, true, 6);
+			vboxFileContents.PackStart (scrolledwindowFileContents, true, true, 0);
+			fileHPaned.Add (vboxFileContents);
+
+			this.vpaned1.Add (fileHPaned);
 			this.vbox1.Add (this.vpaned1);
 			global::Gtk.Box.BoxChild w23 = ((global::Gtk.Box.BoxChild)(this.vbox1 [this.vpaned1]));
 			w23.Position = 0;

diff --git a/...onControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs b/...onControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/CellRendererDiff.cs
@@ -112,7 +112,7 @@ static string ProcessLine (string line)
 
 		protected override void Render (Drawable window, Widget widget, Gdk.Rectangle background_area, Gdk.Rectangle cell_area, Gdk.Rectangle expose_area, CellRendererState flags)
 		{
-			if (isDisposed)
+			if (isDisposed || layout == null)
 				return;
 			if (diffMode) {
 
@@ -129,7 +129,6 @@ protected override void Render (Drawable window, Widget widget, Gdk.Rectangle ba
 				}
 				var treeview = widget as FileTreeView;
 				var p = treeview != null? treeview.CursorLocation : null;
-
 				cell_area.Width -= RightPadding;
 
 				window.DrawRectangle (widget.Style.BaseGC (Gtk.StateType.Normal), true, cell_area.X, cell_area.Y, cell_area.Width - 1, cell_area.Height);