Backmerge: #2446 - Sub font size is incorrect when save to png (svg)

Backmerge to master
epam · Oct 23, 2024 · 4362813 · 4362813
1 parent d807ea1
commit 4362813
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 1 deletion.
diff --git a/api/tests/integration/tests/rendering/acs_style.py b/api/tests/integration/tests/rendering/acs_style.py
@@ -67,6 +67,7 @@
 indigo.setOption("render-hash-spacing", "10")
 indigo.setOption("render-stereo-bond-width", "30")
 indigo.setOption("render-font-size", "20")
+indigo.setOption("render-font-size-sub", "30")
 renderer.renderToFile(mol, joinPathPy("out/acs_style_changed.png", __file__))
 print(checkImageSimilarity("acs_style_changed.png"))
 
@@ -89,6 +90,7 @@
 renderer.renderToFile(mol, joinPathPy("out/" + pngname, __file__))
 print(checkImageSimilarity(pngname))
 
+
 if isIronPython():
     renderer.Dispose()
     indigo.Dispose()
diff --git a/api/tests/integration/tests/rendering/ref/linux/acs_style_changed.png b/api/tests/integration/tests/rendering/ref/linux/acs_style_changed.png
diff --git a/api/tests/integration/tests/rendering/ref/mac/acs_style_changed.png b/api/tests/integration/tests/rendering/ref/mac/acs_style_changed.png
diff --git a/api/tests/integration/tests/rendering/ref/win/acs_style_changed.png b/api/tests/integration/tests/rendering/ref/win/acs_style_changed.png
diff --git a/core/render2d/src/render_common.cpp b/core/render2d/src/render_common.cpp
@@ -315,7 +315,7 @@ void RenderSettings::init(float relativeThickness, float bondLineWidthFactor, Ac
     static constexpr float TWO_DIV_THREE = 2.0f / 3.0f;
     fzz[FONT_SIZE_LABEL] = label_font_size;
     if (acs != nullptr && acs->fontSizeSubAngstrom > 0)
-        fzz[FONT_SIZE_ATTR] = acs->fontSizeAngstrom;
+        fzz[FONT_SIZE_ATTR] = acs->fontSizeSubAngstrom;
     else
         fzz[FONT_SIZE_ATTR] = label_font_size * TWO_DIV_THREE; // unit * 8; // Subscript
     fzz[FONT_SIZE_RGROUP_LOGIC] = label_font_size;