SCM - another attempt to fix focus border when action is disabled (microsoft#199519)

Author: lszomoru

src/vs/workbench/contrib/scm/browser/media/scm.css

@@ -309,15 +309,6 @@
 	display: none;
 }
 
-.scm-view .scm-input .scm-editor .scm-editor-toolbar.disabled .action-item {
-	cursor: default;
-}
-
-.scm-view .scm-input .scm-editor .scm-editor-toolbar.disabled .action-label:hover,
-.scm-view .scm-input .scm-editor .scm-editor-toolbar.disabled .action-item.monaco-dropdown-with-primary:hover {
-	background-color: unset;
-}
-
 .scm-view .scm-input .scm-editor .scm-editor-toolbar.scroll-decoration {
 	box-shadow: var(--vscode-scrollbar-shadow) 0 6px 6px -6px inset;
 }

src/vs/workbench/contrib/scm/browser/scmViewPane.ts

@@ -1883,12 +1883,16 @@ class SCMInputWidgetToolbar extends WorkbenchToolBar {
 				primaryAction = actions.find(a => a.id === lastActionId) ?? actions[0];
 			}
 
+			if (primaryAction &&
+				primaryAction.id !== SCMInputCommandId.CancelAction &&
+				contextKeyService.getContextKeyValue(SCMInputContextKeys.ActionIsEnabled.key) === false) {
+				primaryAction.enabled = false;
+			}
+
 			this._ctxActionCount.set(actions.length);
 			this._dropdownActions = actions.length === 1 ? [] : actions;
 
 			container.classList.toggle('has-no-actions', actions.length === 0);
-			container.classList.toggle('disabled', contextKeyService.getContextKeyValue(SCMInputContextKeys.ActionIsEnabled.key) !== true);
-
 			super.setActions(primaryAction ? [primaryAction] : [], []);
 		};