From 246e537ea3f46358dac8995af6d8ff5da3198cb7 Mon Sep 17 00:00:00 2001 From: Moemoea Fierin <moemoea.fierin@epita.fr> Date: Wed, 9 Oct 2019 14:37:34 +0200 Subject: [PATCH] [ZOOM] Issue #31: missing tmlcp in previous commit - added text disappearance func to all tmlcp --- src/main/java/ui/tmlcp/TMLCPForLoop.java | 2 +- src/main/java/ui/tmlcp/TMLCPRefAD.java | 4 ++-- src/main/java/ui/tmlcp/TMLCPRefSD.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/ui/tmlcp/TMLCPForLoop.java b/src/main/java/ui/tmlcp/TMLCPForLoop.java index 8fc396c12b..3ea8368315 100755 --- a/src/main/java/ui/tmlcp/TMLCPForLoop.java +++ b/src/main/java/ui/tmlcp/TMLCPForLoop.java @@ -146,7 +146,7 @@ public class TMLCPForLoop extends TADForLoop /* Issue #69 TGCWithoutInternalComp // Issue #31 Useless line //g.drawLine(x + width, y + height / 2, x + width + lineLength, y + height / 2); - g.drawString(value, x + (width - textWidth) / 2, y + textY); + drawSingleString(g,value, x + (width - textWidth) / 2, y + textY); } @Override diff --git a/src/main/java/ui/tmlcp/TMLCPRefAD.java b/src/main/java/ui/tmlcp/TMLCPRefAD.java index 6d1035f6a3..5f9ed6688d 100755 --- a/src/main/java/ui/tmlcp/TMLCPRefAD.java +++ b/src/main/java/ui/tmlcp/TMLCPRefAD.java @@ -115,12 +115,12 @@ public class TMLCPRefAD extends TADOneLineText /* Issue #69 TGCOneLineText*/ { g.drawLine(x+(width/2), y+height, x+(width/2), y + lineLength + height); final int offset = scale( 15 ); - g.drawString(name, x + (width - w) / 2, y + textY + offset /* 15 Issue #31 */ ); + drawSingleString(g,name, x + (width - w) / 2, y + textY + offset /* 15 Issue #31 */ ); // Issue #31 final int adOffsetX = scale( 3 ); final int adOffsetY = scale( 12 ); - g.drawString("ad", x + adOffsetX /*3*/, y + adOffsetY ); + drawSingleString(g,"ad", x + adOffsetX /*3*/, y + adOffsetY ); g.drawLine(x, y + offset /*15*/, x + offset /* 15 */, y+ offset /*15 Issue #31 */); final int adBoxOffsetX = scale( 25 ); diff --git a/src/main/java/ui/tmlcp/TMLCPRefSD.java b/src/main/java/ui/tmlcp/TMLCPRefSD.java index e9024a8e60..5d803e2712 100755 --- a/src/main/java/ui/tmlcp/TMLCPRefSD.java +++ b/src/main/java/ui/tmlcp/TMLCPRefSD.java @@ -125,11 +125,11 @@ public class TMLCPRefSD extends TADOneLineText /* Issue #69 TGCOneLineText*/ { g.drawLine(x+(width/2), y+height, x+(width/2), y + lineLength + height); final int offsetDefault = scale( 15 ); - g.drawString(name, x + (width - w) / 2, y + textY + offsetDefault /*15*/); + drawSingleString(g,name, x + (width - w) / 2, y + textY + offsetDefault /*15*/); final int sdOffsetX = scale( 3 ); final int sdOffsetY = scale( 12 ); - g.drawString("sd", x + sdOffsetX /*3*/, y + sdOffsetY /*12*/); + drawSingleString(g,"sd", x + sdOffsetX /*3*/, y + sdOffsetY /*12*/); g.drawLine(x, y + offsetDefault /*15*/, x + offsetDefault /*15*/, y + offsetDefault /*15*/); final int sdBoxOffsetX = scale( 25 ); -- GitLab