Correct text size calculation for #71.

DarwinNE · May 8, 2020 · 6686640 · 6686640
1 parent 47658a0
commit 6686640
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/net/sourceforge/fidocadj/graphic/DecoratedText.java b/src/net/sourceforge/fidocadj/graphic/DecoratedText.java
@@ -137,22 +137,17 @@ public void drawString(String str,
         */
         resetTokenization(str);
         int xc=x;
-        double fontSize;
-        fontSize=g.getFontSize();
+        double fontSize=g.getFontSize();
         int t;
         while((t=getToken())!=END) {
             switch(t) {
                 case CHUNK:
-                    // DB: I am not entirely sure to understand where the
-                    // 20 comes from...
-                    g.setFontSize(fontSize*getSizeMultLevel()*
-                        g.getZoom()/20);
+                    g.setFontSize(fontSize*getSizeMultLevel());
                     // Font size is given in points, i.e. 1/72 of an inch.
                     // FidoCadJ has a 200 dpi internal resolution.
                     g.drawString(btoken.toString(),xc,
                         y-(int)Math.round(
-                            exponentLevel*fontSize*getSizeMultLevel()
-                            /200*72*0.1*g.getZoom()));
+                            exponentLevel*fontSize*getSizeMultLevel()*0.5));
                     xc+=g.getStringWidth(btoken.toString());
                     break;
                 case EXPONENT:

diff --git a/src/net/sourceforge/fidocadj/graphic/swing/Graphics2DSwing.java b/src/net/sourceforge/fidocadj/graphic/swing/Graphics2DSwing.java
@@ -315,7 +315,7 @@ public void setFont(String name, double size)
     */
     public double getFontSize()
     {
-        return f.getSize();
+        return f.getSize()*fontScale;
     }
 
     /** Set the font size.