fix showing text alignment

Author: teras

modules/basetextsubs/src/main/java/com/panayotis/jubler/subs/loader/text/W3CFamily.java

@@ -339,8 +339,12 @@ protected SubEntry parseSubtitleElement(Element element) {
             if (!regionId.isEmpty() && regionMap.containsKey(regionId)) {
                 RegionInfo region = regionMap.get(regionId);
                 SubStyle.Direction direction = region.getDirection();
-                if (entry.getStyle() != null) {
-                    SubStyle newStyle = new SubStyle(entry.getStyle());
+                SubStyle baseStyle = entry.getStyle();
+                if (baseStyle == null && subtitle_list != null && subtitle_list.getStyleList() != null && !subtitle_list.getStyleList().isEmpty()) {
+                    baseStyle = subtitle_list.getStyleList().get(0);
+                }
+                if (baseStyle != null) {
+                    SubStyle newStyle = new SubStyle(baseStyle);
                     newStyle.set(StyleType.DIRECTION, direction);
                     entry.setStyle(newStyle);
                 }

modules/basetextsubs/src/main/java/com/panayotis/jubler/subs/loader/text/WebVTT.java

@@ -202,8 +202,15 @@ private void applyAlignSetting(SubEntry entry, String alignValue) {
                 return; // Unknown align value
         }
 
-        // Apply as style override
-        entry.getStyle().set(StyleType.DIRECTION, direction);
+        SubStyle baseStyle = entry.getStyle();
+        if (baseStyle == null && subtitle_list != null && subtitle_list.getStyleList() != null && !subtitle_list.getStyleList().isEmpty()) {
+            baseStyle = subtitle_list.getStyleList().get(0);
+        }
+        if (baseStyle != null) {
+            SubStyle newStyle = new SubStyle(baseStyle);
+            newStyle.set(StyleType.DIRECTION, direction);
+            entry.setStyle(newStyle);
+        }
     }
 
     /**
@@ -260,7 +267,11 @@ private void applySizeSetting(SubEntry entry, String sizeValue) {
      */
     private void applyLineSetting(SubEntry entry, String lineValue) {
         try {
-            if (entry.getStyle() == null) {
+            SubStyle baseStyle = entry.getStyle();
+            if (baseStyle == null && subtitle_list != null && subtitle_list.getStyleList() != null && !subtitle_list.getStyleList().isEmpty()) {
+                baseStyle = subtitle_list.getStyleList().get(0);
+            }
+            if (baseStyle == null) {
                 return;
             }
 
@@ -269,7 +280,7 @@ private void applyLineSetting(SubEntry entry, String lineValue) {
                 String numericValue = lineValue.replace("%", "").trim();
                 float linePercent = Float.parseFloat(numericValue);
 
-                SubStyle newStyle = new SubStyle(entry.getStyle());
+                SubStyle newStyle = new SubStyle(baseStyle);
                 // Map line percentage to Jubler's vertical positioning
                 if (linePercent <= 25) {
                     // Top positioning
@@ -287,7 +298,7 @@ private void applyLineSetting(SubEntry entry, String lineValue) {
                 int lineNumber = Integer.parseInt(lineValue);
                 // Map line numbers to vertical margins
                 int verticalMargin = Math.max(0, lineNumber * 5);
-                SubStyle newStyle = new SubStyle(entry.getStyle());
+                SubStyle newStyle = new SubStyle(baseStyle);
                 newStyle.set(StyleType.VERTICAL, verticalMargin);
                 entry.setStyle(newStyle);
             }

modules/core/src/main/java/com/panayotis/jubler/subs/JSubEditor.java

@@ -143,8 +143,7 @@ public void setData(SubEntry entry) {
         }
         showStyle();
         if (overstyle != null) {
-            int pos = SubText.getCaretPosition();
-            overstyle.updateVisualData(entry.getStyle(), entry.getStyleovers(), pos, pos, entry.getText());
+            overstyle.updateVisualData(entry.getStyle(), entry.getStyleovers(), 0, 0, entry.getText());
         }
     }
 

modules/core/src/main/java/com/panayotis/jubler/subs/style/SubStyleList.java

@@ -42,11 +42,17 @@ public String getNameAt(int i) {
 
     public int getStyleIndex(SubEntry entry) {
         SubStyle style = entry.getStyle();
-        int res;
-        if (style == null || (res = indexOf(style)) < 0) {
+        if (style == null) {
             entry.setStyle(get(0));
             return 0;
         }
+        int res = indexOf(style);
+        if (res < 0) {
+            res = findStyleIndex(style.Name);
+            if (res < 0) {
+                res = 0;
+            }
+        }
         return res;
     }