Merge pull request #9258 from mono/backport-pr-9251-to-release-8.4

[release-8.4] [Debugger] Fix UX glitches in the Locals & Watch pads

8 files changed, 19 insertions, 12 deletions

diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Gtk/GtkObjectValueTreeView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Gtk/GtkObjectValueTreeView.cs
index 20b9cd981e..9babc5fa45 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Gtk/GtkObjectValueTreeView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Gtk/GtkObjectValueTreeView.cs
@@ -305,7 +305,7 @@ namespace MonoDevelop.Debugger
 			crtValue.Edited += OnValueEdited;
 			crtValue.EditingCanceled += OnEditingCancelled;
 
-			createMsg = GettextCatalog.GetString ("Click here to add a new watch");
+			createMsg = GettextCatalog.GetString ("Add item to watch");
 			CompletionWindowManager.WindowClosed += HandleCompletionWindowClosed;
 			PreviewWindowManager.WindowClosed += HandlePreviewWindowClosed;
 			ScrollAdjustmentsSet += HandleScrollAdjustmentsSet;
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectNameView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectNameView.cs
index 8deb0eabd7..ecac5dc836 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectNameView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectNameView.cs
@@ -64,7 +64,7 @@ namespace MonoDevelop.Debugger
 
 			AddNewExpressionButton = new NSButton {
 				TranslatesAutoresizingMaskIntoConstraints = false,
-				AccessibilityTitle = GettextCatalog.GetString ("Add new expression"),
+				AccessibilityTitle = GettextCatalog.GetString ("Add item to watch"),
 				Image = GetImage ("gtk-add", Gtk.IconSize.Menu),
 				BezelStyle = NSBezelStyle.Inline,
 				Bordered = false
@@ -114,26 +114,27 @@ namespace MonoDevelop.Debugger
 			var name = Node.Name;
 
 			if (Node.IsUnknown) {
-				if (TreeView.DebuggerService.Frame != null)
+				if (!selected && TreeView.DebuggerService.Frame != null)
 					textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueDisabledText));
 			} else if (Node.IsError || Node.IsNotSupported) {
 			} else if (Node.IsImplicitNotSupported) {
 			} else if (Node.IsEvaluating) {
-				if (Node.GetIsEvaluatingGroup ())
+				if (!selected && Node.GetIsEvaluatingGroup ())
 					textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueDisabledText));
 			} else if (Node.IsEnumerable) {
 			} else if (Node is AddNewExpressionObjectValueNode) {
-				placeholder = GettextCatalog.GetString ("Add new expression");
+				placeholder = GettextCatalog.GetString ("Add item to watch");
 				showAddNewExpression = true;
 				name = string.Empty;
 				editable = true;
-			} else if (TreeView.Controller.GetNodeHasChangedSinceLastCheckpoint (Node)) {
+			} else if (!selected && TreeView.Controller.GetNodeHasChangedSinceLastCheckpoint (Node)) {
 				textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueModifiedText));
 			}
 
 			NSView firstView;
 
 			if (showAddNewExpression) {
+				AddNewExpressionButton.Image = GetImage ("gtk-add", Gtk.IconSize.Menu, selected);
 				firstView = AddNewExpressionButton;
 
 				if (!addNewExpressionVisible) {
diff --git a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectValueView.cs b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectValueView.cs
index 88993bfcbc..d6281de310 100644
--- a/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectValueView.cs
+++ b/main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/ObjectValue/Mac/MacDebuggerObjectValueView.cs
@@ -138,17 +138,19 @@ namespace MonoDevelop.Debugger
 				int i = strval.IndexOf ('\n');
 				if (i != -1)
 					strval = strval.Substring (0, i);
-				textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueErrorText));
+				if (!selected)
+					textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueErrorText));
 			} else if (Node.IsImplicitNotSupported) {
-				strval = string.Empty;//val.Value; with new "Show Value" button we don't want to display message "Implicit evaluation is disabled"
-				textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueDisabledText));
+				strval = string.Empty;
+				if (!selected)
+					textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueDisabledText));
 				if (Node.CanRefresh)
 					valueButtonText = GettextCatalog.GetString ("Show Value");
 			} else if (Node.IsEvaluating) {
 				strval = GettextCatalog.GetString ("Evaluating\u2026");
 				showSpinner = true;
-
-				textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueDisabledText));
+				if (!selected)
+					textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueDisabledText));
 			} else if (Node.IsEnumerable) {
 				if (Node is ShowMoreValuesObjectValueNode) {
 					valueButtonText = GettextCatalog.GetString ("Show More");
@@ -162,7 +164,7 @@ namespace MonoDevelop.Debugger
 			} else {
 				strval = TreeView.Controller.GetDisplayValueWithVisualisers (Node, out showViewerButton);
 
-				if (TreeView.Controller.GetNodeHasChangedSinceLastCheckpoint (Node))
+				if (!selected && TreeView.Controller.GetNodeHasChangedSinceLastCheckpoint (Node))
 					textColor = NSColor.FromCGColor (GetCGColor (Styles.ObjectValueTreeValueModifiedText));
 
 				var val = Node.GetDebuggerObjectValue ();
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
index 4ec9672141..abc5d1a137 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
@@ -3056,6 +3056,10 @@
     <EmbeddedResource Include="icons\browser-16~sel.png" />
     <EmbeddedResource Include="icons\browser-16~sel%402x.png" />
     <EmbeddedResource Include="MonoDevelop.Ide.Projects.FileNesting\FileNestingExtensionModel.addin.xml" />
+    <EmbeddedResource Include="icons\add-16~dark~sel.png" />
+    <EmbeddedResource Include="icons\add-16~dark~sel%402x.png" />
+    <EmbeddedResource Include="icons\add-16~sel.png" />
+    <EmbeddedResource Include="icons\add-16~sel%402x.png" />
     <EmbeddedResource Include="icons\add-16~contrast.png" />
     <EmbeddedResource Include="icons\add-16~contrast%402x.png" />
     <EmbeddedResource Include="icons\bug-16~contrast.png" />
diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~dark~sel.png b/main/src/core/MonoDevelop.Ide/icons/add-16~dark~sel.png
new file mode 100644
index 0000000000..affc51bb04
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/add-16~dark~sel.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~dark~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/add-16~dark~sel@2x.png
new file mode 100644
index 0000000000..74db53a226
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/add-16~dark~sel@2x.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~sel.png b/main/src/core/MonoDevelop.Ide/icons/add-16~sel.png
new file mode 100644
index 0000000000..affc51bb04
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/add-16~sel.png
diff --git a/main/src/core/MonoDevelop.Ide/icons/add-16~sel@2x.png b/main/src/core/MonoDevelop.Ide/icons/add-16~sel@2x.png
new file mode 100644
index 0000000000..74db53a226
--- /dev/null
+++ b/main/src/core/MonoDevelop.Ide/icons/add-16~sel@2x.png