angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-14 07:47:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Theme Editor: added "error strip" to right side; removed scroll pane border

Browse Source
This commit is contained in:
Karl Tauber
2020-12-31 18:15:20 +01:00
parent 95ce92fa18
commit d70eca9774
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flatlaf-theme-editor/src/main/java/com/formdev/flatlaf/themeeditor/FlatThemeEditorPane.java
View File

@@ -30,10 +30,13 @@ import javax.swing.JLayer;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.border.MatteBorder;
import org.fife.rsta.ui.CollapsibleSectionPanel; import org.fife.rsta.ui.CollapsibleSectionPanel;
import org.fife.ui.autocomplete.AutoCompletion; import org.fife.ui.autocomplete.AutoCompletion;
import org.fife.ui.autocomplete.CompletionProvider; import org.fife.ui.autocomplete.CompletionProvider;
import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory; import org.fife.ui.rsyntaxtextarea.AbstractTokenMakerFactory;
import org.fife.ui.rsyntaxtextarea.ErrorStrip;
import org.fife.ui.rsyntaxtextarea.FileLocation; import org.fife.ui.rsyntaxtextarea.FileLocation;
import org.fife.ui.rsyntaxtextarea.SyntaxScheme; import org.fife.ui.rsyntaxtextarea.SyntaxScheme;
import org.fife.ui.rsyntaxtextarea.TextEditorPane; import org.fife.ui.rsyntaxtextarea.TextEditorPane;
@@ -118,6 +121,7 @@ class FlatThemeEditorPane
// create scroll pane // create scroll pane
scrollPane = new RTextScrollPane( viewPanel ); scrollPane = new RTextScrollPane( viewPanel );
scrollPane.setBorder( null );
scrollPane.setLineNumbersEnabled( true ); scrollPane.setLineNumbersEnabled( true );
// scale fonts // scale fonts
@@ -127,9 +131,13 @@ class FlatThemeEditorPane
// use same font for line numbers as in editor // use same font for line numbers as in editor
scrollPane.getGutter().setLineNumberFont( textArea.getFont() ); scrollPane.getGutter().setLineNumberFont( textArea.getFont() );
// create error strip
ErrorStrip errorStrip = new ErrorStrip( textArea );
// create collapsible panel // create collapsible panel
collapsiblePanel = new CollapsibleSectionPanel(); collapsiblePanel = new CollapsibleSectionPanel();
collapsiblePanel.add( scrollPane ); collapsiblePanel.add( scrollPane );
collapsiblePanel.add( errorStrip, BorderLayout.LINE_END );
add( collapsiblePanel, BorderLayout.CENTER ); add( collapsiblePanel, BorderLayout.CENTER );
} }
@@ -218,6 +226,8 @@ class FlatThemeEditorPane
void showFindReplaceBar() { void showFindReplaceBar() {
if( findReplaceBar == null ) { if( findReplaceBar == null ) {
findReplaceBar = new FlatFindReplaceBar( textArea ); findReplaceBar = new FlatFindReplaceBar( textArea );
findReplaceBar.setBorder( new MatteBorder( 1, 0, 0, 0,
UIManager.getColor( "Component.borderColor" ) ) );
collapsiblePanel.addBottomComponent( findReplaceBar ); collapsiblePanel.addBottomComponent( findReplaceBar );
} }