Skip to content

Commit e7ae08c

Browse files
hansonrhansonr
authored andcommitted
missing JSSlider default font from HTML5LookAndFeel
1 parent 8ef5847 commit e7ae08c

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

sources/net.sf.j2s.java.core/src/swingjs/plaf/HTML5LookAndFeel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1435,7 +1435,7 @@ public Object createValue(UIDefaults table) {
14351435
textText,
14361436

14371437
// *** Slider
1438-
// "Slider.font", dialogPlain12,
1438+
"Slider.font", dialogPlain12,
14391439
"Slider.foreground", control,
14401440
"Slider.background", control,
14411441
// "Slider.highlight", controlLtHighlight,

sources/net.sf.j2s.java.core/src/swingjs/plaf/JSSliderUI.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import javax.swing.JLabel;
1515
import javax.swing.JScrollBar;
1616
import javax.swing.JSlider;
17+
import javax.swing.LookAndFeel;
1718
import javax.swing.event.ChangeEvent;
1819
import javax.swing.event.ChangeListener;
1920
import sun.swing.DefaultLookup;
@@ -126,6 +127,8 @@ private void disposeSlider() {
126127
@Override
127128
public void installUI(JComponent jc) {
128129
setSliderFields();
130+
LookAndFeel.installColorsAndFont(jc, "Slider.background", "Slider.foreground",
131+
"Slider.font");
129132
}
130133

131134
private void setSliderFields() {
@@ -405,8 +408,8 @@ void setScrollBarExtentAndCSS() {
405408

406409

407410
@Override
408-
public Dimension getMinimumSize(JComponent c) {
409-
return (isScrollBar ? super.getMinimumSize(c)
411+
public Dimension getMinimumSize() {
412+
return (isScrollBar ? super.getMinimumSize()
410413
: isHoriz ? getMinimumHorizontalSize() : getMinimumVerticalSize());
411414
}
412415

@@ -429,8 +432,8 @@ private Dimension getMinimumVerticalSize() {
429432
}
430433

431434
@Override
432-
public Dimension getPreferredSize(JComponent c) {
433-
return (isScrollBar ? super.getPreferredSize(c) : isHoriz ? getPreferredHorizontalSize() : getPreferredVerticalSize());
435+
public Dimension getPreferredSize() {
436+
return (isScrollBar ? super.getPreferredSize() : isHoriz ? getPreferredHorizontalSize() : getPreferredVerticalSize());
434437
}
435438

436439
public Dimension getPreferredHorizontalSize() {
@@ -525,8 +528,8 @@ public void setInnerComponentBounds(int width, int height) {
525528

526529

527530
@Override
528-
Dimension getMaximumSize(JComponent jc) {
529-
Dimension d = super.getMaximumSize(jc);
531+
protected Dimension getMaximumSize() {
532+
Dimension d = super.getMaximumSize();
530533
return (d != null ? d : isHoriz ? new Dimension(Short.MAX_VALUE, 40) : new Dimension(40, Short.MAX_VALUE));
531534
}
532535

0 commit comments

Comments
 (0)