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

DBE: First version of table comparison

Browse Source
This commit is contained in:
Alexander Kass
2015-03-19 15:36:58 +03:00
parent 85db38d318
commit bebde7a4e5
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java
+5 -5
View File
@@ -231,7 +231,7 @@ public class DiffDividerDrawUtil {
myColor = color;
}
private void paint(Graphics2D g, int width, boolean paintBorder, boolean curve) {
public void paint(Graphics2D g, int width, boolean paintBorder, boolean curve) {
// we need this shift, because editor background highlight is painted in range "Y(line) - 1 .. Y(line + 1) - 1"
int startY1 = myStart1 - 1;
int endY1 = myEnd1 - 1;
@@ -249,7 +249,7 @@ public class DiffDividerDrawUtil {
}
}
private void paintOnScrollbar(Graphics2D g, int width) {
public void paintOnScrollbar(Graphics2D g, int width) {
int startY = myStart1 - 1;
int endY = myEnd1 - 1;
int height = endY - startY;
@@ -288,11 +288,11 @@ public class DiffDividerDrawUtil {
myEnd2 = end2;
}
private void paint(Graphics2D g, int width) {
public void paint(Graphics2D g, int width) {
DiffDrawUtil.drawConnectorLineSeparator(g, 0, width, myStart1, myEnd1, myStart2, myEnd2);
}
private void paintOnScrollbar(Graphics2D g, int width) {
public void paintOnScrollbar(Graphics2D g, int width) {
DiffDrawUtil.drawConnectorLineSeparator(g, 0, width, myStart1, myEnd1, myStart1, myEnd1);
}
@@ -301,7 +301,7 @@ public class DiffDividerDrawUtil {
}
}
private static class Interval {
public static class Interval {
public final int startLine;
public final int endLine;
platform/diff-impl/src/com/intellij/diff/util/DiffDrawUtil.java
+5 -1
View File
@@ -42,7 +42,11 @@ public class DiffDrawUtil {
@NotNull
public static Color getDividerColor(@Nullable Editor editor) {
EditorColorsScheme scheme = editor != null ? editor.getColorsScheme() : EditorColorsManager.getInstance().getGlobalScheme();
return getDividerColorFromScheme(editor != null ? editor.getColorsScheme() : EditorColorsManager.getInstance().getGlobalScheme());
}
@NotNull
public static Color getDividerColorFromScheme(@NotNull EditorColorsScheme scheme) {
Color gutterBackground = scheme.getColor(EditorColors.GUTTER_BACKGROUND);
if (gutterBackground == null) {
gutterBackground = EditorColors.GUTTER_BACKGROUND.getDefaultColor();