浏览代码

:recycle: Address some TODOs

Signed-off-by: palexdev <alessandro.parisi406@gmail.com>
palexdev 3 年之前
父节点
当前提交
7e2a3b7123
共有 22 个文件被更改,包括 82 次插入75 次删除
  1. 1 1
      materialfx/src/main/java/io/github/palexdev/materialfx/beans/properties/synced/SynchronizedLongProperty.java
  2. 7 7
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXButton.java
  3. 5 5
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXCheckbox.java
  4. 2 1
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXCircleToggleNode.java
  5. 5 5
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXProgressBar.java
  6. 6 5
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXRadioButton.java
  7. 3 1
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXSlider.java
  8. 3 1
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXStepper.java
  9. 5 1
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXStepperToggle.java
  10. 5 5
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXToggleButton.java
  11. 2 5
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXTreeItem.java
  12. 2 2
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXTreeView.java
  13. 8 7
      materialfx/src/main/java/io/github/palexdev/materialfx/controls/legacy/MFXLegacyListCell.java
  14. 0 1
      materialfx/src/main/java/io/github/palexdev/materialfx/factories/InsetsFactory.java
  15. 5 5
      materialfx/src/main/java/io/github/palexdev/materialfx/font/MFXFontIcon.java
  16. 2 2
      materialfx/src/main/java/io/github/palexdev/materialfx/skins/MFXCircleToggleNodeSkin.java
  17. 2 2
      materialfx/src/main/java/io/github/palexdev/materialfx/skins/MFXRectangleToggleNodeSkin.java
  18. 1 1
      materialfx/src/main/java/io/github/palexdev/materialfx/skins/MFXTextFieldSkin.java
  19. 2 1
      materialfx/src/main/java/io/github/palexdev/materialfx/skins/MFXTreeItemSkin.java
  20. 9 9
      materialfx/src/main/java/io/github/palexdev/materialfx/skins/legacy/MFXLegacyComboBoxSkin.java
  21. 0 1
      materialfx/src/main/java/io/github/palexdev/materialfx/utils/StyleablePropertiesUtils.java
  22. 7 7
      materialfx/src/main/java/io/github/palexdev/materialfx/utils/TextUtils.java

+ 1 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/beans/properties/synced/SynchronizedLongProperty.java

@@ -179,7 +179,7 @@ public class SynchronizedLongProperty extends SimpleLongProperty implements Sync
             throw new IllegalArgumentException("Cannot bind to itself!");
         }
 
-        if (isBound()) unbind(); // TODO check, may be unnecessary
+        if (isBound()) unbind();
         BiBindingManager.instance().bindBidirectional(this).to(other).create();
     }
 

+ 7 - 7
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXButton.java

@@ -19,11 +19,12 @@
 package io.github.palexdev.materialfx.controls;
 
 import io.github.palexdev.materialfx.MFXResourcesLoader;
-import io.github.palexdev.materialfx.enums.ButtonType;
+import io.github.palexdev.materialfx.beans.PositionBean;
 import io.github.palexdev.materialfx.effects.DepthLevel;
 import io.github.palexdev.materialfx.effects.ripple.MFXCircleRippleGenerator;
-import io.github.palexdev.materialfx.beans.PositionBean;
+import io.github.palexdev.materialfx.enums.ButtonType;
 import io.github.palexdev.materialfx.skins.MFXButtonSkin;
+import io.github.palexdev.materialfx.utils.StyleablePropertiesUtils;
 import javafx.beans.property.*;
 import javafx.css.*;
 import javafx.geometry.Pos;
@@ -33,8 +34,6 @@ import javafx.scene.control.Skin;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -332,9 +331,10 @@ public class MFXButton extends Button {
                         ButtonType.FLAT);
 
         static {
-            List<CssMetaData<? extends Styleable, ?>> btnCssMetaData = new ArrayList<>(Button.getClassCssMetaData());
-            Collections.addAll(btnCssMetaData, DEPTH_LEVEL, BUTTON_TYPE);
-            cssMetaDataList = Collections.unmodifiableList(btnCssMetaData);
+            cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+                    Button.getClassCssMetaData(),
+                    DEPTH_LEVEL, BUTTON_TYPE
+            );
         }
 
     }

+ 5 - 5
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXCheckbox.java

@@ -21,13 +21,12 @@ package io.github.palexdev.materialfx.controls;
 import io.github.palexdev.materialfx.MFXResourcesLoader;
 import io.github.palexdev.materialfx.controls.base.MFXLabeled;
 import io.github.palexdev.materialfx.skins.MFXCheckboxSkin;
+import io.github.palexdev.materialfx.utils.StyleablePropertiesUtils;
 import javafx.css.*;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Skin;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -162,9 +161,10 @@ public class MFXCheckbox extends CheckBox implements MFXLabeled {
                 );
 
         static {
-            List<CssMetaData<? extends Styleable, ?>> ckbCssMetaData = new ArrayList<>(CheckBox.getClassCssMetaData());
-            Collections.addAll(ckbCssMetaData, CONTENT_DISPOSITION, GAP, TEXT_EXPAND);
-            cssMetaDataList = Collections.unmodifiableList(ckbCssMetaData);
+            cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+                    CheckBox.getClassCssMetaData(),
+                    CONTENT_DISPOSITION, GAP, TEXT_EXPAND
+            );
         }
     }
 

+ 2 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXCircleToggleNode.java

@@ -172,7 +172,8 @@ public class MFXCircleToggleNode extends AbstractMFXToggleNode {
 				);
 
 		static {
-			cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(ToggleButton.getClassCssMetaData(),
+			cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+					ToggleButton.getClassCssMetaData(),
 					GAP, SIZE, TEXT_POSITION
 			);
 		}

+ 5 - 5
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXProgressBar.java

@@ -21,6 +21,7 @@ package io.github.palexdev.materialfx.controls;
 import io.github.palexdev.materialfx.MFXResourcesLoader;
 import io.github.palexdev.materialfx.beans.NumberRange;
 import io.github.palexdev.materialfx.skins.MFXProgressBarSkin;
+import io.github.palexdev.materialfx.utils.StyleablePropertiesUtils;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
@@ -28,8 +29,6 @@ import javafx.css.*;
 import javafx.scene.control.ProgressBar;
 import javafx.scene.control.Skin;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import static io.github.palexdev.materialfx.utils.NodeUtils.isPseudoClassActive;
@@ -171,9 +170,10 @@ public class MFXProgressBar extends ProgressBar {
                 );
 
         static {
-            List<CssMetaData<? extends Styleable, ?>> prbCssMetaData = new ArrayList<>(ProgressBar.getClassCssMetaData());
-            Collections.addAll(prbCssMetaData, ANIMATION_SPEED);
-            cssMetaDataList = Collections.unmodifiableList(prbCssMetaData);
+            cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+                    ProgressBar.getClassCssMetaData(),
+                    ANIMATION_SPEED
+            );
         }
     }
 

+ 6 - 5
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXRadioButton.java

@@ -21,13 +21,12 @@ package io.github.palexdev.materialfx.controls;
 import io.github.palexdev.materialfx.MFXResourcesLoader;
 import io.github.palexdev.materialfx.controls.base.MFXLabeled;
 import io.github.palexdev.materialfx.skins.MFXRadioButtonSkin;
+import io.github.palexdev.materialfx.utils.StyleablePropertiesUtils;
 import javafx.css.*;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.RadioButton;
 import javafx.scene.control.Skin;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -227,9 +226,11 @@ public class MFXRadioButton extends RadioButton implements MFXLabeled {
                 );
 
         static {
-            List<CssMetaData<? extends Styleable, ?>> rdbCssMetaData = new ArrayList<>(RadioButton.getClassCssMetaData());
-            Collections.addAll(rdbCssMetaData, CONTENT_DISPOSITION, GAP, RADIO_GAP, RADIUS, TEXT_EXPAND);
-            cssMetaDataList = Collections.unmodifiableList(rdbCssMetaData);
+            cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+                    RadioButton.getClassCssMetaData(),
+                    CONTENT_DISPOSITION, GAP, RADIO_GAP,
+                    RADIUS, TEXT_EXPAND
+            );
         }
 
     }

+ 3 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXSlider.java

@@ -29,6 +29,7 @@ import io.github.palexdev.materialfx.font.MFXFontIcon;
 import io.github.palexdev.materialfx.skins.MFXSliderSkin;
 import io.github.palexdev.materialfx.utils.NodeUtils;
 import io.github.palexdev.materialfx.utils.NumberUtils;
+import io.github.palexdev.materialfx.utils.StyleablePropertiesUtils;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
 import javafx.collections.FXCollections;
@@ -864,7 +865,8 @@ public class MFXSlider extends Control {
                 );
 
         static {
-            cssMetaDataList = List.of(
+            cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+                    Control.getClassCssMetaData(),
                     SLIDER_MODE, UNIT_INCREMENT, ALTERNATIVE_UNIT_INCREMENT,
                     TICK_UNIT, SHOW_MAJOR_TICKS, SHOW_MINOR_TICKS, SHOW_TICKS_AT_EDGE, MINOR_TICKS_COUNT,
                     ANIMATE_ON_PRESS, BIDIRECTIONAL, ORIENTATION, POPUP_SIDE

+ 3 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXStepper.java

@@ -24,6 +24,7 @@ import io.github.palexdev.materialfx.controls.MFXStepperToggle.MFXStepperToggleE
 import io.github.palexdev.materialfx.enums.StepperToggleState;
 import io.github.palexdev.materialfx.skins.MFXStepperSkin;
 import io.github.palexdev.materialfx.utils.NodeUtils;
+import io.github.palexdev.materialfx.utils.StyleablePropertiesUtils;
 import io.github.palexdev.materialfx.validation.MFXValidator;
 import io.github.palexdev.materialfx.validation.Validated;
 import javafx.beans.property.*;
@@ -658,7 +659,8 @@ public class MFXStepper extends Control {
                 );
 
         static {
-            cssMetaDataList = List.of(
+            cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+                    Control.getClassCssMetaData(),
                     SPACING, EXTRA_SPACING, ALIGNMENT, BASE_COLOR, ALT_COLOR,
                     BORDER_RADIUS, PROGRESS_BAR_BACKGROUND, PROGRESS_COLOR, PROGRESS_BAR_ANIMATED
             );

+ 5 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXStepperToggle.java

@@ -23,6 +23,7 @@ import io.github.palexdev.materialfx.enums.StepperToggleState;
 import io.github.palexdev.materialfx.enums.TextPosition;
 import io.github.palexdev.materialfx.skins.MFXStepperSkin;
 import io.github.palexdev.materialfx.skins.MFXStepperToggleSkin;
+import io.github.palexdev.materialfx.utils.StyleablePropertiesUtils;
 import io.github.palexdev.materialfx.validation.MFXValidator;
 import io.github.palexdev.materialfx.validation.Validated;
 import javafx.beans.property.*;
@@ -364,7 +365,10 @@ public class MFXStepperToggle extends Control implements Validated {
                 );
 
         static {
-            cssMetaDataList = List.of(LABEL_TEXT_GAP, TEXT_POSITION, SIZE, STROKE_WIDTH);
+            cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+                    Control.getClassCssMetaData(),
+                    LABEL_TEXT_GAP, TEXT_POSITION, SIZE, STROKE_WIDTH
+            );
         }
     }
 

+ 5 - 5
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXToggleButton.java

@@ -5,6 +5,7 @@ import io.github.palexdev.materialfx.beans.properties.EventHandlerProperty;
 import io.github.palexdev.materialfx.controls.base.MFXLabeled;
 import io.github.palexdev.materialfx.skins.MFXToggleButtonSkin;
 import io.github.palexdev.materialfx.utils.ColorUtils;
+import io.github.palexdev.materialfx.utils.StyleablePropertiesUtils;
 import io.github.palexdev.materialfx.utils.ToggleButtonsUtil;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -18,8 +19,6 @@ import javafx.scene.control.*;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.paint.Color;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -340,9 +339,10 @@ public class MFXToggleButton extends Labeled implements Toggle, MFXLabeled {
                 );
 
         static {
-            List<CssMetaData<? extends Styleable, ?>> tobCssMetaData = new ArrayList<>(Labeled.getClassCssMetaData());
-            Collections.addAll(tobCssMetaData, CONTENT_DISPOSITION, GAP, LENGTH, RADIUS, TEXT_EXPAND);
-            cssMetaDataList = Collections.unmodifiableList(tobCssMetaData);
+            cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+                    Labeled.getClassCssMetaData(),
+                    CONTENT_DISPOSITION, GAP, LENGTH, RADIUS, TEXT_EXPAND
+            );
         }
     }
 

+ 2 - 5
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXTreeItem.java

@@ -22,6 +22,7 @@ import io.github.palexdev.materialfx.MFXResourcesLoader;
 import io.github.palexdev.materialfx.controls.base.AbstractMFXTreeCell;
 import io.github.palexdev.materialfx.controls.base.AbstractMFXTreeItem;
 import io.github.palexdev.materialfx.controls.cell.MFXSimpleTreeCell;
+import io.github.palexdev.materialfx.factories.InsetsFactory;
 import io.github.palexdev.materialfx.selection.TreeSelectionModel;
 import io.github.palexdev.materialfx.selection.base.ITreeSelectionModel;
 import io.github.palexdev.materialfx.skins.MFXTreeItemSkin;
@@ -30,7 +31,6 @@ import javafx.collections.ListChangeListener;
 import javafx.css.*;
 import javafx.event.Event;
 import javafx.event.EventType;
-import javafx.geometry.Insets;
 import javafx.scene.control.Skin;
 import javafx.scene.layout.VBox;
 import javafx.util.Callback;
@@ -303,10 +303,7 @@ public class MFXTreeItem<T> extends AbstractMFXTreeItem<T> {
     @Override
     protected void layoutChildren() {
         super.layoutChildren();
-
-        items.forEach(
-                item -> VBox.setMargin(item, new Insets(0, 0, 0, getChildrenMargin()))
-        );
+        items.forEach(item -> VBox.setMargin(item, InsetsFactory.right(getChildrenMargin())));
     }
 
     @Override

+ 2 - 2
materialfx/src/main/java/io/github/palexdev/materialfx/controls/MFXTreeView.java

@@ -20,6 +20,7 @@ package io.github.palexdev.materialfx.controls;
 
 import io.github.palexdev.materialfx.MFXResourcesLoader;
 import io.github.palexdev.materialfx.controls.base.AbstractMFXTreeItem;
+import io.github.palexdev.materialfx.factories.InsetsFactory;
 import io.github.palexdev.materialfx.selection.TreeSelectionModel;
 import io.github.palexdev.materialfx.selection.base.ITreeSelectionModel;
 import io.github.palexdev.materialfx.utils.NodeUtils;
@@ -29,7 +30,6 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.event.Event;
 import javafx.event.EventType;
-import javafx.geometry.Insets;
 
 /**
  * This is the container for a tree made of AbstractMFXTreeItems.
@@ -101,7 +101,7 @@ public class MFXTreeView<T> extends MFXScrollPane {
     public void setupRoot() {
         AbstractMFXTreeItem<T> root = getRoot();
         root.prefWidthProperty().bind(widthProperty().subtract(10));
-        root.setPadding(new Insets(0, 0, 5, 0));
+        root.setPadding(InsetsFactory.bottom(5));
         NodeUtils.waitForSkin(root, () -> {
             if (!isShowRoot()) {
                 root.fireEvent(new TreeViewEvent(TreeViewEvent.HIDE_ROOT_EVENT, isShowRoot()));

+ 8 - 7
materialfx/src/main/java/io/github/palexdev/materialfx/controls/legacy/MFXLegacyListCell.java

@@ -19,8 +19,9 @@
 package io.github.palexdev.materialfx.controls.legacy;
 
 import io.github.palexdev.materialfx.MFXResourcesLoader;
-import io.github.palexdev.materialfx.effects.ripple.MFXCircleRippleGenerator;
 import io.github.palexdev.materialfx.beans.PositionBean;
+import io.github.palexdev.materialfx.effects.ripple.MFXCircleRippleGenerator;
+import io.github.palexdev.materialfx.factories.InsetsFactory;
 import io.github.palexdev.materialfx.utils.NodeUtils;
 import javafx.css.*;
 import javafx.geometry.Insets;
@@ -65,7 +66,7 @@ public class MFXLegacyListCell<T> extends ListCell<T> {
     //================================================================================
     private void initialize() {
         getStyleClass().add(STYLE_CLASS);
-        setPadding(new Insets(8, 12, 8, 12));
+        setPadding(InsetsFactory.of(8, 12, 8, 12));
         addListeners();
     }
 
@@ -88,15 +89,15 @@ public class MFXLegacyListCell<T> extends ListCell<T> {
 
         selectedProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue) {
-                NodeUtils.updateBackground(MFXLegacyListCell.this, getSelectedColor(), new CornerRadii(getCornerRadius()), new Insets(getBackgroundInsets()));
+                NodeUtils.updateBackground(MFXLegacyListCell.this, getSelectedColor(), new CornerRadii(getCornerRadius()), InsetsFactory.all(getBackgroundInsets()));
             } else {
-                NodeUtils.updateBackground(MFXLegacyListCell.this, Color.WHITE, new CornerRadii(getCornerRadius()), new Insets(getBackgroundInsets()));
+                NodeUtils.updateBackground(MFXLegacyListCell.this, Color.WHITE, new CornerRadii(getCornerRadius()), InsetsFactory.all(getBackgroundInsets()));
             }
         });
 
         backgroundProperty().addListener((observable, oldValue, newValue) -> {
             if (newValue != null && isSelected() && !containsFill(newValue.getFills(), getSelectedColor())) {
-                NodeUtils.updateBackground(this, getSelectedColor(), new CornerRadii(getCornerRadius()), new Insets(getBackgroundInsets()));
+                NodeUtils.updateBackground(this, getSelectedColor(), new CornerRadii(getCornerRadius()), InsetsFactory.all(getBackgroundInsets()));
             }
         });
 
@@ -109,10 +110,10 @@ public class MFXLegacyListCell<T> extends ListCell<T> {
                 if (getIndex() == 0) {
                     setBackground(new Background(new BackgroundFill(getHoverColor(), CornerRadii.EMPTY, Insets.EMPTY)));
                 } else {
-                    NodeUtils.updateBackground(MFXLegacyListCell.this, getHoverColor(), new CornerRadii(getCornerRadius()), new Insets(getBackgroundInsets()));
+                    NodeUtils.updateBackground(MFXLegacyListCell.this, getHoverColor(), new CornerRadii(getCornerRadius()), InsetsFactory.all(getBackgroundInsets()));
                 }
             } else {
-                NodeUtils.updateBackground(MFXLegacyListCell.this, Color.WHITE, new CornerRadii(getCornerRadius()), new Insets(getBackgroundInsets()));
+                NodeUtils.updateBackground(MFXLegacyListCell.this, Color.WHITE, new CornerRadii(getCornerRadius()), InsetsFactory.all(getBackgroundInsets()));
             }
         });
 

+ 0 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/factories/InsetsFactory.java

@@ -2,7 +2,6 @@ package io.github.palexdev.materialfx.factories;
 
 import javafx.geometry.Insets;
 
-// TODO replace everywhere
 /**
  * Convenience class to build {@link Insets} objects.
  */

+ 5 - 5
materialfx/src/main/java/io/github/palexdev/materialfx/font/MFXFontIcon.java

@@ -18,6 +18,7 @@
 
 package io.github.palexdev.materialfx.font;
 
+import io.github.palexdev.materialfx.utils.StyleablePropertiesUtils;
 import javafx.beans.binding.Bindings;
 import javafx.css.*;
 import javafx.scene.paint.Color;
@@ -25,8 +26,6 @@ import javafx.scene.text.Font;
 import javafx.scene.text.FontSmoothingType;
 import javafx.scene.text.Text;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -213,9 +212,10 @@ public class MFXFontIcon extends Text {
                 );
 
         static {
-            List<CssMetaData<? extends Styleable, ?>> txtCssMetaData = new ArrayList<>(Text.getClassCssMetaData());
-            Collections.addAll(txtCssMetaData, COLOR, DESCRIPTION, SIZE);
-            cssMetaDataList = Collections.unmodifiableList(txtCssMetaData);
+            cssMetaDataList = StyleablePropertiesUtils.cssMetaDataList(
+                    Text.getClassCssMetaData(),
+                    COLOR, DESCRIPTION, SIZE
+            );
         }
     }
 

+ 2 - 2
materialfx/src/main/java/io/github/palexdev/materialfx/skins/MFXCircleToggleNodeSkin.java

@@ -5,8 +5,8 @@ import io.github.palexdev.materialfx.controls.MFXCircleToggleNode;
 import io.github.palexdev.materialfx.controls.MFXTextField;
 import io.github.palexdev.materialfx.effects.ripple.MFXCircleRippleGenerator;
 import io.github.palexdev.materialfx.enums.TextPosition;
-import io.github.palexdev.materialfx.utils.LabelUtils;
 import io.github.palexdev.materialfx.utils.NodeUtils;
+import io.github.palexdev.materialfx.utils.TextUtils;
 import javafx.beans.binding.Bindings;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
@@ -160,7 +160,7 @@ public class MFXCircleToggleNodeSkin extends SkinBase<MFXCircleToggleNode> {
 		double gap = label.getGraphicTextGap();
 		Node leading = toggleNode.getLabelLeadingIcon();
 		Node trailing = toggleNode.getLabelTrailingIcon();
-		double labelWidth = LabelUtils.computeTextWidth(toggleNode.getFont(), toggleNode.getText()) +
+		double labelWidth = TextUtils.computeTextWidth(toggleNode.getFont(), toggleNode.getText()) +
 				label.snappedLeftInset() +
 				label.snappedRightInset() +
 				(leading != null ? leading.prefWidth(-1) + gap : 0) +

+ 2 - 2
materialfx/src/main/java/io/github/palexdev/materialfx/skins/MFXRectangleToggleNodeSkin.java

@@ -22,8 +22,8 @@ import io.github.palexdev.materialfx.beans.PositionBean;
 import io.github.palexdev.materialfx.controls.MFXRectangleToggleNode;
 import io.github.palexdev.materialfx.controls.MFXTextField;
 import io.github.palexdev.materialfx.effects.ripple.MFXCircleRippleGenerator;
-import io.github.palexdev.materialfx.utils.LabelUtils;
 import io.github.palexdev.materialfx.utils.NodeUtils;
+import io.github.palexdev.materialfx.utils.TextUtils;
 import javafx.beans.binding.Bindings;
 import javafx.scene.Node;
 import javafx.scene.control.SkinBase;
@@ -183,7 +183,7 @@ public class MFXRectangleToggleNodeSkin extends SkinBase<MFXRectangleToggleNode>
 		double gap = label.getGraphicTextGap();
 		Node leading = toggleNode.getLabelLeadingIcon();
 		Node trailing = toggleNode.getLabelTrailingIcon();
-		double textWidth = LabelUtils.computeTextWidth(toggleNode.getFont(), toggleNode.getText())
+		double textWidth = TextUtils.computeTextWidth(toggleNode.getFont(), toggleNode.getText())
 				+ label.snappedLeftInset() + label.snappedRightInset() + 10; // Take into account the caret width and some more space to be sure text won't wobble around
 		return leftInset +
 				(leading != null ? leading.prefWidth(-1) + gap : 0) +

+ 1 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/skins/MFXTextFieldSkin.java

@@ -329,7 +329,7 @@ public class MFXTextFieldSkin extends SkinBase<MFXTextField> {
 		// at the start of the Pane
 		double floatW = floatingText.prefWidth(-1);
 		double floatH = floatingText.prefHeight(-1);
-		double floatX = (floatMode == FloatMode.ABOVE) ? 1 : xOffset; // TODO change above doc
+		double floatX = (floatMode == FloatMode.ABOVE) ? 1 : xOffset;
 		PositionBean floatPos = PositionUtils.computePosition(
 				textField,
 				floatingText,

+ 2 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/skins/MFXTreeItemSkin.java

@@ -21,6 +21,7 @@ package io.github.palexdev.materialfx.skins;
 import io.github.palexdev.materialfx.controls.MFXTreeItem;
 import io.github.palexdev.materialfx.controls.base.AbstractMFXTreeCell;
 import io.github.palexdev.materialfx.controls.base.AbstractMFXTreeItem;
+import io.github.palexdev.materialfx.factories.InsetsFactory;
 import io.github.palexdev.materialfx.factories.MFXAnimationFactory;
 import io.github.palexdev.materialfx.selection.TreeSelectionModel;
 import io.github.palexdev.materialfx.utils.AnimationUtils;
@@ -247,7 +248,7 @@ public class MFXTreeItemSkin<T> extends SkinBase<MFXTreeItem<T>> {
                     forceUpdate();
                 }
                 cell.setVisible(false);
-                item.setPadding(new Insets(-(item.getInitialHeight() * 2), 0, 0, -item.getChildrenMargin()));
+                item.setPadding(InsetsFactory.of(-(item.getInitialHeight() * 2), 0, 0, -item.getChildrenMargin()));
             } else {
                 cell.setVisible(true);
                 item.setPadding(Insets.EMPTY);

+ 9 - 9
materialfx/src/main/java/io/github/palexdev/materialfx/skins/legacy/MFXLegacyComboBoxSkin.java

@@ -21,7 +21,7 @@ package io.github.palexdev.materialfx.skins.legacy;
 import io.github.palexdev.materialfx.controls.MFXIconWrapper;
 import io.github.palexdev.materialfx.controls.legacy.MFXLegacyComboBox;
 import io.github.palexdev.materialfx.factories.MFXAnimationFactory;
-import io.github.palexdev.materialfx.utils.LabelUtils;
+import io.github.palexdev.materialfx.utils.TextUtils;
 import io.github.palexdev.materialfx.validation.Constraint;
 import io.github.palexdev.materialfx.validation.MFXValidator;
 import javafx.animation.ScaleTransition;
@@ -184,15 +184,15 @@ public class MFXLegacyComboBoxSkin<T> extends ComboBoxListViewSkin<T> {
     //================================================================================
     @Override
     protected void layoutChildren(double x, double y, double w, double h) {
-        super.layoutChildren(x, y, w, h);
+	    super.layoutChildren(x, y, w, h);
 
-        double lw = snapSizeX(LabelUtils.computeLabelWidth(validate));
-        double lh = snapSizeY(LabelUtils.computeTextHeight(validate.getFont(), validate.getText()));
-        double lx = 0;
-        double ly = h + (padding * 0.7);
+	    double lw = snapSizeX(TextUtils.computeLabelWidth(validate));
+	    double lh = snapSizeY(TextUtils.computeTextHeight(validate.getFont(), validate.getText()));
+	    double lx = 0;
+	    double ly = h + (padding * 0.7);
 
-        validate.resizeRelocate(lx, ly, lw, lh);
-        focusedLine.relocate(0, h);
-        unfocusedLine.relocate(0, h);
+	    validate.resizeRelocate(lx, ly, lw, lh);
+	    focusedLine.relocate(0, h);
+	    unfocusedLine.relocate(0, h);
     }
 }

+ 0 - 1
materialfx/src/main/java/io/github/palexdev/materialfx/utils/StyleablePropertiesUtils.java

@@ -13,7 +13,6 @@ public class StyleablePropertiesUtils {
     private StyleablePropertiesUtils() {
     }
 
-    // TODO replace everywhere
     @SafeVarargs
     public static List<CssMetaData<? extends Styleable, ?>> cssMetaDataList(List<CssMetaData<? extends Styleable, ?>> styleable, CssMetaData<? extends Styleable, ?>... cssMetaData) {
         CssMetaDataList styleableMetaData = new CssMetaDataList(styleable);

+ 7 - 7
materialfx/src/main/java/io/github/palexdev/materialfx/utils/LabelUtils.java → materialfx/src/main/java/io/github/palexdev/materialfx/utils/TextUtils.java

@@ -29,9 +29,9 @@ import javafx.scene.text.Text;
 /**
  * Utils class for JavaFX's {@code Labels} and {@code MFXLabels}.
  */
-public class LabelUtils { // TODO rename to TextUtils
+public class TextUtils {
 
-	private LabelUtils() {
+	private TextUtils() {
 	}
 
 	/**
@@ -148,10 +148,10 @@ public class LabelUtils { // TODO rename to TextUtils
      */
     public static double computeLabelWidth(Label label) {
         Node graphic = label.getGraphic();
-        return label.snappedLeftInset() +
-                (graphic != null ? graphic.getBoundsInParent().getWidth() : 0) +
-                LabelUtils.computeTextWidth(label.getFont(), label.getText()) +
-                label.snappedRightInset() +
-                label.getGraphicTextGap();
+	    return label.snappedLeftInset() +
+			    (graphic != null ? graphic.getBoundsInParent().getWidth() : 0) +
+			    TextUtils.computeTextWidth(label.getFont(), label.getText()) +
+			    label.snappedRightInset() +
+			    label.getGraphicTextGap();
     }
 }