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

Merge branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
Bas Leijdekkers
2011-09-20 15:55:03 +02:00
parent 535451e145 42eb2aaf1c
commit dee093d255
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/application/options/colors/ClickNavigator.java
+4 -1
View File
@@ -32,6 +32,7 @@ import com.intellij.openapi.editor.highlighter.HighlighterIterator;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.psi.tree.IElementType;
import com.intellij.ui.ListScrollingUtil;
import com.intellij.util.ui.UIUtil;
import javax.swing.*;
import java.awt.*;
@@ -168,7 +169,9 @@ public class ClickNavigator {
}
public static void setCursor(final Editor view, int type) {
view.getContentComponent().setCursor(Cursor.getPredefinedCursor(type));
final Cursor cursor = type == Cursor.TEXT_CURSOR && view instanceof EditorEx ?
UIUtil.getTextCursor(((EditorEx)view).getBackgroundColor()) : Cursor.getPredefinedCursor(type);
view.getContentComponent().setCursor(cursor);
}
}
platform/platform-impl/src/com/intellij/execution/impl/EditorHyperlinkSupport.java
+6 -1
View File
@@ -26,6 +26,7 @@ import com.intellij.openapi.editor.colors.CodeInsightColors;
import com.intellij.openapi.editor.colors.EditorColorsManager;
import com.intellij.openapi.editor.event.EditorMouseAdapter;
import com.intellij.openapi.editor.event.EditorMouseEvent;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.ex.MarkupModelEx;
import com.intellij.openapi.editor.markup.HighlighterLayer;
import com.intellij.openapi.editor.markup.HighlighterTargetArea;
@@ -38,6 +39,7 @@ import com.intellij.util.BeforeAfter;
import com.intellij.util.Consumer;
import com.intellij.util.SmartList;
import com.intellij.util.containers.HashMap;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -88,7 +90,10 @@ public class EditorHyperlinkSupport {
myEditor.getContentComponent().setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
}
else {
myEditor.getContentComponent().setCursor(Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
final Cursor cursor = editor instanceof EditorEx ?
UIUtil.getTextCursor(((EditorEx)editor).getBackgroundColor()) :
Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR);
myEditor.getContentComponent().setCursor(cursor);
}
}
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+1 -4
View File
@@ -63,7 +63,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.wm.IdeFocusManager;
import com.intellij.openapi.wm.IdeGlassPane;
import com.intellij.ui.ColorUtil;
import com.intellij.ui.GuiUtils;
import com.intellij.ui.LightweightHint;
import com.intellij.ui.components.JBScrollBar;
@@ -78,7 +77,6 @@ import com.intellij.util.containers.HashMap;
import com.intellij.util.messages.MessageBusConnection;
import com.intellij.util.text.CharArrayUtil;
import com.intellij.util.ui.ButtonlessScrollBarUI;
import com.intellij.util.ui.MacUIUtil;
import com.intellij.util.ui.UIUtil;
import com.intellij.util.ui.update.UiNotifyConnector;
import gnu.trove.TIntArrayList;
@@ -3517,8 +3515,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
return;
}
}
myEditorComponent.setCursor(SystemInfo.isMac && ColorUtil.isDark(getBackgroundColor()) ?
MacUIUtil.getInvertedTextCursor(): Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR));
myEditorComponent.setCursor(UIUtil.getTextCursor(getBackgroundColor()));
}
}
platform/util/src/com/intellij/util/ui/UIUtil.java
+5
View File
@@ -89,6 +89,11 @@ public class UIUtil {
}
}
public static Cursor getTextCursor(final Color backgroundColor) {
return SystemInfo.isMac && ColorUtil.isDark(backgroundColor) ?
MacUIUtil.getInvertedTextCursor(): Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR);
}
public enum FontSize { NORMAL, SMALL, MINI }
public enum ComponentStyle {REGULAR, SMALL, MINI}
public enum FontColor {NORMAL, BRIGHTER}