MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

partial revert

Browse Source
This commit is contained in:
vadim.lomshakov
2017-04-27 16:54:10 +03:00
parent 5b20bb0630
commit 5313fcca50
5 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
-1
View File
@@ -214,7 +214,6 @@ public class DiffUtil {
editor.getSettings().setShowIntentionBulb(false);
((EditorMarkupModel)editor.getMarkupModel()).setErrorStripeVisible(true);
editor.getGutterComponentEx().setShowDefaultGutterPopup(false);
editor.getGutterComponentEx().resetInitialIconAreaWidth();
if (enableFolding) {
setFoldingModelSupport(editor);
platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
-1
View File
@@ -83,7 +83,6 @@ public class ConsoleViewUtil {
editorSettings.setRightMarginShown(false);
editorSettings.setCaretRowShown(false);
editor.getGutterComponentEx().setPaintBackground(false);
editor.getGutterComponentEx().resetInitialIconAreaWidth();
editor.putUserData(EDITOR_IS_CONSOLE_VIEW, true);
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
-1
View File
@@ -93,7 +93,6 @@ 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);
platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
-2
View File
@@ -64,6 +64,4 @@ public abstract class EditorGutterComponentEx extends JComponent implements Edit
public abstract void setForceShowRightFreePaintersArea(boolean value);
public abstract void setInitialIconAreaWidth(int width);
public abstract void resetInitialIconAreaWidth();
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
-5
View File
@@ -1810,11 +1810,6 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
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) {