before applying a style the effect of that style is removed now

this fixes a problem when cloning an ElementType where it was possible that the same style was applied twice
nifty-gui · May 6, 2012 · 4fcf4fc · 4fcf4fc
1 parent 2882496
commit 4fcf4fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/nifty-core/src/main/java/de/lessvoid/nifty/loaderv2/types/EffectType.java b/nifty-core/src/main/java/de/lessvoid/nifty/loaderv2/types/EffectType.java
@@ -34,6 +34,7 @@ public EffectType(final EffectType e) {
     for (EffectValueType effectValue : e.effectValues) {
       effectValues.add(effectValue.clone());
     }
+    styleId = e.styleId;
   }
 
   public EffectType clone() {

diff --git a/nifty-core/src/main/java/de/lessvoid/nifty/loaderv2/types/StyleType.java b/nifty-core/src/main/java/de/lessvoid/nifty/loaderv2/types/StyleType.java
@@ -56,6 +56,7 @@ public void applyTo(final ElementType elementType, final StyleResolver styleReso
   }
 
   void applyToInternal(final ElementType elementType) {
+    elementType.removeWithTag(getStyleId());
     if (attributesType != null) {
       attributesType.apply(elementType.getAttributes(), getStyleId());
     }