Ticket #2479: 2479.patch

src/main/java/org/sophie2/main/func/text/styling/TextFontHud.java

@@ -203 +203 @@
                         protected int computeAlignment() {
                                 return FlowLayout.LEFT;
                         }
-                        
+
                         @Override
                         protected int computeHorizontalGap() {
                                 return 0;
                         }
-                        
+
                         private final HotAttr<String> getAttribute() {
                                 return CommonAttr.FONT_FAMILY;
                         }
@@ -258 +258 @@
                         protected int computeAlignment() {
                                 return FlowLayout.LEFT;
                         }
-                        
+
                         @Override
                         protected int computeHorizontalGap() {
                                 return 0;
@@ -284 +284 @@
 
                         @Override
                         protected BoundValidation validate(ComboInput<Float> inputData) {
-                                return BoundValidation.SUCCESS;
+
+
+                                String fontSize = null;
+                                if (inputData.getSelectedItem() != null) {
+                                        fontSize = "" + inputData.getSelectedItem();
+                                } else if (inputData.getFieldValue() != null) {
+                                        fontSize = inputData.getFieldValue();
+                                }
+
+                                if (fontSize != null) {
+                                        return BoundValidation.validateNumber(fontSize, Float.class,
+                                                        0f, Float.MAX_VALUE,
+                                        "Font size should be between %.2f%% and %.0f%%.");
+                                }
+
+                                return new BoundValidation(BoundValidation.Status.ERROR,
+                                "Only positive numeric values allowed here.");
+
                         }
                 }
         }
@@ -629 +646 @@
                                 String field = input.getFieldValue(); 
                                 Float fontSize ;
 
-                                if (field!=null && !"".equals(field)) {
-                                        fontSize = Float.parseFloat(field);
-                                } else {
-                                        fontSize = input.getSelectedItem() != null ? new Float(input
-                                                        .getSelectedItem()) : new Float(input.getFieldValue());
+                                if (field == null || "".equals(field)) {
+                                        return false;
                                 }
+                                fontSize = input.getSelectedItem() != null ? new Float(input
+                                                .getSelectedItem()) : Float.parseFloat(field);
 
                                 TextStyleUtils.addStyleToSelection(
                                                 AppHaloUtil.getWorkArea(source), source.getAttribute(),