rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-27 21:54:30 +01:00
Code Issues Releases Activity

Ensure hyperlinks are coloured using theme.txt colour

Browse Source 
Enabling [CTRL,CMD]+click to open hyperlinks
This commit is contained in:
Federico Fissore 2015-04-28 12:36:42 +02:00
parent 5967294287
commit eb42243475
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/processing/app/Editor.java
View File

@ -956,23 +956,32 @@ public class Editor extends JFrame implements RunnerListener {
return null; return null;
} }
protected SketchTextArea createTextArea() throws IOException { protected SketchTextArea createTextArea() throws IOException {
SketchTextArea textArea = new SketchTextArea(base.getPdeKeywords()); SketchTextArea textArea = new SketchTextArea(base.getPdeKeywords());
textArea.requestFocusInWindow(); textArea.requestFocusInWindow();
textArea.setMarkOccurrences(true); textArea.setMarkOccurrences(true);
textArea.setMarginLineEnabled(false); textArea.setMarginLineEnabled(false);
textArea.setCodeFoldingEnabled(PreferencesData.getBoolean("editor.codefolding")); textArea.setCodeFoldingEnabled(PreferencesData.getBoolean("editor.codefolding"));
textArea.setAntiAliasingEnabled(PreferencesData.getBoolean("editor.antialias")); textArea.setAntiAliasingEnabled(PreferencesData.getBoolean("editor.antialias"));
// textArea.setClearWhitespaceLinesEnabled(false); textArea.setTabsEmulated(PreferencesData.getBoolean("editor.tabs.expand"));
textArea.setTabsEmulated(PreferencesData.getBoolean("editor.tabs.expand")); textArea.setTabSize(PreferencesData.getInteger("editor.tabs.size"));
textArea.setTabSize(PreferencesData.getInteger("editor.tabs.size")); textArea.setEditorListener(new EditorListener(this));
textArea.setEditorListener(new EditorListener(this)); textArea.addHyperlinkListener(new HyperlinkListener() {
@Override
ToolTipManager.sharedInstance().registerComponent(textArea); public void hyperlinkUpdate(HyperlinkEvent hyperlinkEvent) {
try {
configurePopupMenu(textArea); base.getPlatform().openURL(hyperlinkEvent.getURL().toExternalForm());
return textArea; } catch (Exception e) {
Base.showWarning(e.getMessage(), e.getMessage(), e);
}
}
});
ToolTipManager.sharedInstance().registerComponent(textArea);
configurePopupMenu(textArea);
return textArea;
} }
protected JMenuItem createToolMenuItem(String className) { protected JMenuItem createToolMenuItem(String className) {

1
app/src/processing/app/syntax/SketchTextArea.java
View File

@ -112,6 +112,7 @@ public class SketchTextArea extends RSyntaxTextArea {
setUseSelectedTextColor(false); setUseSelectedTextColor(false);
setSelectionColor(processing.app.Theme.getColor("editor.selection.color")); setSelectionColor(processing.app.Theme.getColor("editor.selection.color"));
setMatchedBracketBorderColor(processing.app.Theme.getColor("editor.brackethighlight.color")); setMatchedBracketBorderColor(processing.app.Theme.getColor("editor.brackethighlight.color"));
setHyperlinkForeground((Color) processing.app.Theme.getStyledFont("url", getFont()).get("color"));
setSyntaxTheme(TokenTypes.DATA_TYPE, "data_type"); setSyntaxTheme(TokenTypes.DATA_TYPE, "data_type");
setSyntaxTheme(TokenTypes.FUNCTION, "function"); setSyntaxTheme(TokenTypes.FUNCTION, "function");