Skip to content

Commit 702a0fe

Browse files
committed
Force UserAgent as style origin. Fixes #121
1 parent 8ed16d1 commit 702a0fe

File tree

2 files changed

+27
-0
lines changed

2 files changed

+27
-0
lines changed

core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/FontIcon.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import javafx.beans.property.IntegerProperty;
2121
import javafx.beans.property.ObjectProperty;
2222
import javafx.css.CssMetaData;
23+
import javafx.css.StyleOrigin;
2324
import javafx.css.Styleable;
2425
import javafx.css.StyleableIntegerProperty;
2526
import javafx.css.StyleableObjectProperty;
@@ -120,6 +121,11 @@ public Object getBean() {
120121
public String getName() {
121122
return "iconSize";
122123
}
124+
125+
@Override
126+
public StyleOrigin getStyleOrigin() {
127+
return StyleOrigin.USER_AGENT;
128+
}
123129
};
124130
iconSize.addListener((v, o, n) -> {
125131
Font font = FontIcon.this.getFont();
@@ -150,6 +156,11 @@ public Object getBean() {
150156
public String getName() {
151157
return "iconColor";
152158
}
159+
160+
@Override
161+
public StyleOrigin getStyleOrigin() {
162+
return StyleOrigin.USER_AGENT;
163+
}
153164
};
154165
iconColor.addListener((v, o, n) -> FontIcon.this.setFill(n));
155166
}
@@ -173,6 +184,11 @@ public Object getBean() {
173184
public String getName() {
174185
return "iconCode";
175186
}
187+
188+
@Override
189+
public StyleOrigin getStyleOrigin() {
190+
return StyleOrigin.USER_AGENT;
191+
}
176192
};
177193

178194
iconCode.addListener((v, o, n) -> {

core/ikonli-javafx/src/main/java/org/kordamp/ikonli/javafx/StackedFontIcon.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import javafx.collections.ListChangeListener;
2424
import javafx.collections.MapChangeListener;
2525
import javafx.css.CssMetaData;
26+
import javafx.css.StyleOrigin;
2627
import javafx.css.Styleable;
2728
import javafx.css.StyleableIntegerProperty;
2829
import javafx.css.StyleableObjectProperty;
@@ -165,6 +166,11 @@ public Object getBean() {
165166
public String getName() {
166167
return "iconSize";
167168
}
169+
170+
@Override
171+
public StyleOrigin getStyleOrigin() {
172+
return StyleOrigin.USER_AGENT;
173+
}
168174
};
169175
iconSize.addListener(iconSizeChangeListener);
170176
}
@@ -188,6 +194,11 @@ public Object getBean() {
188194
public String getName() {
189195
return "iconColor";
190196
}
197+
198+
@Override
199+
public StyleOrigin getStyleOrigin() {
200+
return StyleOrigin.USER_AGENT;
201+
}
191202
};
192203
iconColor.addListener(iconColorChangeListener);
193204
}

0 commit comments

Comments
 (0)