Skip to content

Commit f52af58

Browse files
haidubogdanhaidubogdan
committed
- simplify font change update event and StyleUtils attribute update
- include anchor coloring option, set fixed size for heading elements, code element, set cursor to text cursor
1 parent 5bcafdb commit f52af58

11 files changed

Lines changed: 129 additions & 60 deletions

File tree

‎ide/markdown/src/org/netbeans/modules/markdown/MarkdownViewerElement.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import com.vladsch.flexmark.util.data.DataHolder;
2828
import com.vladsch.flexmark.util.data.MutableDataSet;
2929
import java.awt.BorderLayout;
30+
import java.awt.Cursor;
3031
import java.awt.Rectangle;
3132
import java.beans.PropertyChangeEvent;
3233
import java.beans.PropertyChangeListener;
@@ -150,7 +151,6 @@ public void changedUpdate(DocumentEvent e) {
150151
private StyledDocument source;
151152

152153
//Font config update listener
153-
private volatile boolean fontChanged = false;
154154
private final PropertyChangeListener pcl = this::colorProfileChange;
155155

156156
public MarkdownViewerElement(Lookup lookup) {
@@ -165,6 +165,8 @@ public JComponent getVisualRepresentation() {
165165
viewer.setEditorKit(new MarkdownEditorKit());
166166
viewer.setEditable(false);
167167
viewer.addHyperlinkListener(this::linkHandler);
168+
Cursor textCursor = Cursor.getPredefinedCursor(Cursor.TEXT_CURSOR);
169+
viewer.setCursor(textCursor);
168170

169171
JPanel panel = new JPanel(new BorderLayout());
170172
panel.add(new JScrollPane(viewer), BorderLayout.CENTER);
@@ -268,7 +270,6 @@ public void updateView() {
268270
kit.read(htmlReader, doc, 0);
269271

270272
viewer.scrollRectToVisible(vis);
271-
272273
} catch (IOException ex) {
273274
viewer.setText(Bundle.TXT_MarkdownViewerElement_Error());
274275
LOG.log(Level.WARNING, "Could not parse markdown!", ex); //NOI18N
@@ -318,18 +319,16 @@ public void colorProfileChange(PropertyChangeEvent evt) {
318319
}
319320

320321
String newValue = evt.getNewValue() instanceof String value ? value : ""; // NOI18N
321-
322+
boolean fontChanged = false;
322323
//patch for triggering font update
323-
if (!fontChanged &&
324-
"fontColors".equals(evt.getPropertyName()) // NOI18N
324+
if ("fontColors".equals(evt.getPropertyName()) // NOI18N
325325
&& evt.getOldValue() != null
326326
&& !newValue.startsWith("test") // NOI18N
327327
) {
328328
fontChanged = true;
329329
}
330330

331331
if (fontChanged || EditorSettings.PROP_CURRENT_FONT_COLOR_PROFILE.equals(evt.getPropertyName())) {
332-
fontChanged = false;
333332
viewer.setEditorKit(new MarkdownEditorKit());
334333
updateView();
335334
}

‎ide/markdown/src/org/netbeans/modules/markdown/resources/Bundle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ heading4 = H4
2727
heading5 = H5
2828
heading6 = H6
2929

30+
anchor = Anchor
3031
pre = Code block
3132
code = Inline code
3233
blockquote = Block quote

‎ide/markdown/src/org/netbeans/modules/markdown/resources/Coloring.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
=========================
2+
============================
33
```
44
COLORING PREVIEW NOT ENABLED
55
```
6-
=========================
6+
============================
77

‎ide/markdown/src/org/netbeans/modules/markdown/resources/FontAndColors-bluetheme.xml‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,30 @@
2121
-->
2222
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
2323
<fontscolors>
24-
<fontcolor name="body" default="default"/>
25-
<fontcolor name="code" bgColor="38566F"/>
26-
<fontcolor name="pre" bgColor="38566F"/>
27-
<fontcolor name="heading1"/>
28-
<fontcolor name="heading2" default="heading1"/>
29-
<fontcolor name="heading3" default="heading1"/>
30-
<fontcolor name="heading4" default="heading1"/>
31-
<fontcolor name="heading5" default="heading1"/>
32-
<fontcolor name="heading6" default="heading1"/>
24+
<fontcolor name="body" default="default" foreColor="F0F6FC"/>
25+
<fontcolor name="anchor" foreColor="4493F8"/>
26+
<fontcolor name="code" bgColor="1C2533">
27+
<font size="14"/>
28+
</fontcolor>
29+
<fontcolor name="pre" bgColor="1C2533"/>
30+
<fontcolor name="blockquote"/>
31+
<fontcolor name="heading1">
32+
<font size="32"/>
33+
</fontcolor>
34+
<fontcolor name="heading2">
35+
<font size="24"/>
36+
</fontcolor>
37+
<fontcolor name="heading3">
38+
<font size="20"/>
39+
</fontcolor>
40+
<fontcolor name="heading4">
41+
<font size="16"/>
42+
</fontcolor>
43+
<fontcolor name="heading5">
44+
<font size="14"/>
45+
</fontcolor>
46+
<fontcolor name="heading6">
47+
<font size="12"/>
48+
</fontcolor>
3349
</fontscolors>
3450

‎ide/markdown/src/org/netbeans/modules/markdown/resources/FontAndColors-citylights.xml‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,29 @@
2222
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
2323
<fontscolors>
2424
<fontcolor name="body" default="default"/>
25-
<fontcolor name="code" bgColor="38566F"/>
25+
<fontcolor name="anchor" foreColor="0969DA"/>
26+
<fontcolor name="code" bgColor="38566F">
27+
<font size="14"/>
28+
</fontcolor>
2629
<fontcolor name="pre" bgColor="38566F"/>
27-
<fontcolor name="heading1"/>
28-
<fontcolor name="heading2" default="heading1"/>
29-
<fontcolor name="heading3" default="heading1"/>
30-
<fontcolor name="heading4" default="heading1"/>
31-
<fontcolor name="heading5" default="heading1"/>
32-
<fontcolor name="heading6" default="heading1"/>
30+
<fontcolor name="blockquote"/>
31+
<fontcolor name="heading1">
32+
<font size="32"/>
33+
</fontcolor>
34+
<fontcolor name="heading2">
35+
<font size="24"/>
36+
</fontcolor>
37+
<fontcolor name="heading3">
38+
<font size="20"/>
39+
</fontcolor>
40+
<fontcolor name="heading4">
41+
<font size="16"/>
42+
</fontcolor>
43+
<fontcolor name="heading5">
44+
<font size="14"/>
45+
</fontcolor>
46+
<fontcolor name="heading6">
47+
<font size="12"/>
48+
</fontcolor>
3349
</fontscolors>
3450

‎ide/markdown/src/org/netbeans/modules/markdown/resources/FontAndColors-earth.xml‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,29 @@
2222
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
2323
<fontscolors>
2424
<fontcolor name="body" default="default"/>
25-
<fontcolor name="code" bgColor="38566F"/>
25+
<fontcolor name="anchor" foreColor="0969DA"/>
26+
<fontcolor name="code" bgColor="38566F">
27+
<font size="14"/>
28+
</fontcolor>
2629
<fontcolor name="pre" bgColor="38566F"/>
27-
<fontcolor name="heading1"/>
28-
<fontcolor name="heading2" default="heading1"/>
29-
<fontcolor name="heading3" default="heading1"/>
30-
<fontcolor name="heading4" default="heading1"/>
31-
<fontcolor name="heading5" default="heading1"/>
32-
<fontcolor name="heading6" default="heading1"/>
30+
<fontcolor name="blockquote"/>
31+
<fontcolor name="heading1">
32+
<font size="32"/>
33+
</fontcolor>
34+
<fontcolor name="heading2">
35+
<font size="24"/>
36+
</fontcolor>
37+
<fontcolor name="heading3">
38+
<font size="20"/>
39+
</fontcolor>
40+
<fontcolor name="heading4">
41+
<font size="16"/>
42+
</fontcolor>
43+
<fontcolor name="heading5">
44+
<font size="14"/>
45+
</fontcolor>
46+
<fontcolor name="heading6">
47+
<font size="12"/>
48+
</fontcolor>
3349
</fontscolors>
3450

‎ide/markdown/src/org/netbeans/modules/markdown/resources/FontAndColors-flatlafdark.xml‎

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,29 @@
2222
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
2323
<fontscolors>
2424
<fontcolor name="body" default="default"/>
25-
<fontcolor name="code" bgColor="364135"/>
25+
<fontcolor name="anchor" foreColor="4493F8"/>
26+
<fontcolor name="code" bgColor="364135">
27+
<font size="14"/>
28+
</fontcolor>
2629
<fontcolor name="pre" bgColor="364135"/>
27-
<fontcolor name="heading1"/>
28-
<fontcolor name="heading2" default="heading1"/>
29-
<fontcolor name="heading3" default="heading1"/>
30-
<fontcolor name="heading4" default="heading1"/>
31-
<fontcolor name="heading5" default="heading1"/>
32-
<fontcolor name="heading6" default="heading1"/>
30+
<fontcolor name="blockquote"/>
31+
<fontcolor name="heading1">
32+
<font size="32"/>
33+
</fontcolor>
34+
<fontcolor name="heading2">
35+
<font size="24"/>
36+
</fontcolor>
37+
<fontcolor name="heading3">
38+
<font size="20"/>
39+
</fontcolor>
40+
<fontcolor name="heading4">
41+
<font size="16"/>
42+
</fontcolor>
43+
<fontcolor name="heading5">
44+
<font size="14"/>
45+
</fontcolor>
46+
<fontcolor name="heading6">
47+
<font size="12"/>
48+
</fontcolor>
3349
</fontscolors>
3450

‎ide/markdown/src/org/netbeans/modules/markdown/resources/FontAndColors.xml‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,29 @@
2222
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
2323
<fontscolors>
2424
<fontcolor name="body" default="default"/>
25-
<fontcolor name="code" bgColor="F6F8FA"/>
25+
<fontcolor name="anchor" foreColor="0969DA"/>
26+
<fontcolor name="code" bgColor="F6F8FA">
27+
<font size="14"/>
28+
</fontcolor>
2629
<fontcolor name="pre" bgColor="F6F8FA"/>
2730
<fontcolor name="blockquote"/>
28-
<fontcolor name="heading1"/>
29-
<fontcolor name="heading2" default="heading1"/>
30-
<fontcolor name="heading3" default="heading1"/>
31-
<fontcolor name="heading4" default="heading1"/>
32-
<fontcolor name="heading5" default="heading1"/>
33-
<fontcolor name="heading6" default="heading1"/>
31+
<fontcolor name="heading1">
32+
<font size="32"/>
33+
</fontcolor>
34+
<fontcolor name="heading2">
35+
<font size="24"/>
36+
</fontcolor>
37+
<fontcolor name="heading3">
38+
<font size="20"/>
39+
</fontcolor>
40+
<fontcolor name="heading4">
41+
<font size="16"/>
42+
</fontcolor>
43+
<fontcolor name="heading5">
44+
<font size="14"/>
45+
</fontcolor>
46+
<fontcolor name="heading6">
47+
<font size="12"/>
48+
</fontcolor>
3449
</fontscolors>
3550

‎ide/markdown/src/org/netbeans/modules/markdown/ui/preview/views/MarkdownViewFactory.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public class MarkdownViewFactory extends HTMLEditorKit.HTMLFactory {
3838

3939
@Override
4040
public View create(Element elem) {
41-
4241
if (isElementOfTag(elem, HTML.Tag.INPUT)) {
4342
return new CheckboxView(elem);
4443
} else if (isElementOfTag(elem, HTML.Tag.HR)) {

‎ide/markdown/src/org/netbeans/modules/markdown/utils/Bundle.properties‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@
1717

1818
CSS_DEFAULT=body {padding:10px 25px;}\
1919
h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {font-size:inherit;}\
20-
ul, li ul {margin-left: 20px;}\
20+
ul, li ul {margin-left: 20px;margin-bottom: 0px;}\
2121
li {margin-bottom: 3px;padding-left:5px;}\
2222
table {border-spacing:0;}\
2323
th, td {border:1px solid rgb(209, 217, 224); padding:10px;}\
24-
code {border-radius: 6px;}\
24+
code {padding:2px 0px;}\
2525
pre {padding:16px;margin-bottom:10px;}\
26-
pre code {border-radius:0px;}\
2726
blockquote {padding: 0 16px; margin: 0px; margin-bottom:10px; border-left: 2px solid rgb(209, 217, 224);}\
28-
li blockquote {margin-bottom: 0px;}
27+
li blockquote {margin-bottom: 0px;} table {margin-top:6px;margin-bottom:6px;}

0 commit comments

Comments
 (0)