From 5b20bb0630304576ac46495bc6b44ca054ad1a0b Mon Sep 17 00:00:00 2001
From: "vadim.lomshakov" <vadim.lomshakov@jetbrains.com>
Date: Wed, 12 Apr 2017 12:21:40 +0300
Subject: [PATCH] [rider]: allow to change initial icon area width

---
 .../src/com/intellij/diff/util/DiffUtil.java        |  1 +
 .../intellij/execution/impl/ConsoleViewUtil.java    |  1 +
 .../com/intellij/openapi/diff/impl/DiffUtil.java    |  1 +
 .../openapi/editor/ex/EditorGutterComponentEx.java  |  4 ++++
 .../editor/impl/EditorGutterComponentImpl.java      | 13 ++++++++++++-
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
index 922145918392..a8c250aa8cfd 100644
--- a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
@@ -214,6 +214,7 @@ public class DiffUtil {
     editor.getSettings().setShowIntentionBulb(false);
     ((EditorMarkupModel)editor.getMarkupModel()).setErrorStripeVisible(true);
     editor.getGutterComponentEx().setShowDefaultGutterPopup(false);
+    editor.getGutterComponentEx().resetInitialIconAreaWidth();
 
     if (enableFolding) {
       setFoldingModelSupport(editor);
diff --git a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
index e9510a62618e..8e0816b76dcd 100644
--- a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
+++ b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
@@ -83,6 +83,7 @@ public class ConsoleViewUtil {
       editorSettings.setRightMarginShown(false);
       editorSettings.setCaretRowShown(false);
       editor.getGutterComponentEx().setPaintBackground(false);
+      editor.getGutterComponentEx().resetInitialIconAreaWidth();
 
       editor.putUserData(EDITOR_IS_CONSOLE_VIEW, true);
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
index 290c59241e4e..8cc5d830a978 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
@@ -93,6 +93,7 @@ public class DiffUtil {
     EditorEx editor = (EditorEx)(isViewer ? factory.createViewer(document, project) : factory.createEditor(document, project));
     editor.putUserData(DiffManagerImpl.EDITOR_IS_DIFF_KEY, Boolean.TRUE);
     editor.getGutterComponentEx().revalidateMarkup();
+    editor.getGutterComponentEx().resetInitialIconAreaWidth();
 
     if (fileType != null && project != null && !project.isDisposed()) {
       CodeStyleFacade codeStyleFacade = CodeStyleFacade.getInstance(project);
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
index 121225170095..1d63c853d6d9 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
@@ -62,4 +62,8 @@ public abstract class EditorGutterComponentEx extends JComponent implements Edit
   public abstract void setForceShowLeftFreePaintersArea(boolean value);
 
   public abstract void setForceShowRightFreePaintersArea(boolean value);
+
+  public abstract void setInitialIconAreaWidth(int width);
+
+  public abstract void resetInitialIconAreaWidth();
 }
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
index 9fe9d6542d8a..68c5fb52ef7b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
@@ -127,6 +127,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
   private final EditorImpl myEditor;
   private final FoldingAnchorsOverlayStrategy myAnchorsDisplayStrategy;
   @Nullable private TIntObjectHashMap<List<GutterMark>> myLineToGutterRenderers;
+  private int myStartIconAreaWidth = START_ICON_AREA_WIDTH;
   private int myIconsAreaWidth;
   private int myLineNumberAreaWidth;
   private int myAdditionalLineNumberAreaWidth;
@@ -809,7 +810,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
       }
     });
 
-    int minWidth = areIconsShown() ? scaleWidth(START_ICON_AREA_WIDTH) : 0;
+    int minWidth = areIconsShown() ? scaleWidth(myStartIconAreaWidth) : 0;
     myIconsAreaWidth = canShrink ? minWidth : Math.max(myIconsAreaWidth, minWidth);
 
     processGutterRenderers((line, renderers) -> {
@@ -1804,6 +1805,16 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
     myForceRightFreePaintersAreaShown = value;
   }
 
+  @Override
+  public void setInitialIconAreaWidth(int width) {
+    myStartIconAreaWidth = width;
+  }
+
+  @Override
+  public void resetInitialIconAreaWidth() {
+    myStartIconAreaWidth = START_ICON_AREA_WIDTH;
+  }
+
   private void invokePopup(MouseEvent e) {
     final ActionManager actionManager = ActionManager.getInstance();
     if (myEditor.getMouseEventArea(e) == EditorMouseEventArea.ANNOTATIONS_AREA) {