Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Intellij Community
Commits
5b20bb06
Commit
5b20bb06
authored
8 years ago
by
vadim.lomshakov
Browse files
Options
Download
Email Patches
Plain Diff
[rider]: allow to change initial icon area width
parent
cc8ad998
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+1
-0
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
+1
-0
...impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
+1
-0
...orm-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
+4
-0
...m/intellij/openapi/editor/ex/EditorGutterComponentEx.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+12
-1
...tellij/openapi/editor/impl/EditorGutterComponentImpl.java
with
19 additions
and
1 deletion
+19
-1
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
+
1
-
0
View file @
5b20bb06
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
+
1
-
0
View file @
5b20bb06
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/openapi/diff/impl/DiffUtil.java
+
1
-
0
View file @
5b20bb06
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/openapi/editor/ex/EditorGutterComponentEx.java
+
4
-
0
View file @
5b20bb06
...
...
@@ -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
();
}
This diff is collapsed.
Click to expand it.
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+
12
-
1
View file @
5b20bb06
...
...
@@ -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
)
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help