From afdc5a8a92e2e01388851179ba3e25b52bd4149d Mon Sep 17 00:00:00 2001
From: Moemoea Fierin <moemoea.fierin@epita.fr>
Date: Wed, 9 Oct 2019 17:01:03 +0200
Subject: [PATCH] [ZOOM] Issue #31 text disapearance on AvatarCD
- override check
- function change to new drawSingleString
---
src/main/java/ui/avatarcd/AvatarCDActorBox.java | 4 ++--
src/main/java/ui/avatarcd/AvatarCDActorStickman.java | 2 +-
src/main/java/ui/avatarcd/AvatarCDAssociationConnector.java | 2 +-
src/main/java/ui/avatarcd/AvatarCDBlock.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/ui/avatarcd/AvatarCDActorBox.java b/src/main/java/ui/avatarcd/AvatarCDActorBox.java
index a7229cc40f..b9179ab4aa 100755
--- a/src/main/java/ui/avatarcd/AvatarCDActorBox.java
+++ b/src/main/java/ui/avatarcd/AvatarCDActorBox.java
@@ -103,8 +103,8 @@ public class AvatarCDActorBox extends TGCScalableOneLineText {
width = Math.max(Math.max(w, w1) + space, minWidth);
}
h = g.getFontMetrics().getHeight();
- g.drawString(STEREOTYPE, x + ((width - w1) / 2), y + h + space/2);
- g.drawString(value, x + ((width - w) / 2) , y + height - h);
+ drawSingleString(g, STEREOTYPE, x + ((width - w1) / 2), y + h + space/2);
+ drawSingleString(g, value, x + ((width - w) / 2) , y + height - h);
g.drawRect(x, y, width, height);
}
diff --git a/src/main/java/ui/avatarcd/AvatarCDActorStickman.java b/src/main/java/ui/avatarcd/AvatarCDActorStickman.java
index ea4441114c..5fd4354641 100755
--- a/src/main/java/ui/avatarcd/AvatarCDActorStickman.java
+++ b/src/main/java/ui/avatarcd/AvatarCDActorStickman.java
@@ -109,7 +109,7 @@ public class AvatarCDActorStickman extends TGCScalableOneLineText {
//right leg
g.drawLine(x+width/2, y+height-width/2, x+width, y+height);
//name of actor
- g.drawString(value, x + width / 2 - w / 2 , y + height + h);
+ drawSingleString(g, value, x + width / 2 - w / 2 , y + height + h);
height = height + h;
}
diff --git a/src/main/java/ui/avatarcd/AvatarCDAssociationConnector.java b/src/main/java/ui/avatarcd/AvatarCDAssociationConnector.java
index 068fedccd5..5817e4da78 100755
--- a/src/main/java/ui/avatarcd/AvatarCDAssociationConnector.java
+++ b/src/main/java/ui/avatarcd/AvatarCDAssociationConnector.java
@@ -69,7 +69,7 @@ public class AvatarCDAssociationConnector extends TGConnectorWithCommentConnect
// Indicate semantics
//w = g.getFontMetrics().stringWidth(value);
//h = g.getFontMetrics().getHeight();
- //g.drawString(value, (p1.getX() + p2.getX() - w) / 2, (p1.getY() + p2.getY())/2);
+ //drawSingleString(g, value, (p1.getX() + p2.getX() - w) / 2, (p1.getY() + p2.getY())/2);
}
/*protected void drawMiddleSegment(Graphics g, int x1, int y1, int x2, int y2) {
diff --git a/src/main/java/ui/avatarcd/AvatarCDBlock.java b/src/main/java/ui/avatarcd/AvatarCDBlock.java
index b9eec5991e..beb1fb6c87 100644
--- a/src/main/java/ui/avatarcd/AvatarCDBlock.java
+++ b/src/main/java/ui/avatarcd/AvatarCDBlock.java
@@ -203,13 +203,13 @@ public class AvatarCDBlock extends TGCScalableWithInternalComponent implements S
w = g.getFontMetrics().stringWidth(ster);
h = currentFontSize + (int) (textY1 * tdp.getZoom());
if ((w < (2 * textX + width)) && (h < height)) {
- g.drawString(ster, x + (width - w) / 2, y + h);
+ drawSingleString(g, ster, x + (width - w) / 2, y + h);
}
g.setFont(f0);
w = g.getFontMetrics().stringWidth(value);
h = 2 * (currentFontSize + (int) (textY1 * tdp.getZoom()));
if ((w < (2 * textX + width)) && (h < height)) {
- g.drawString(value, x + (width - w) / 2, y + h);
+ drawSingleString(g, value, x + (width - w) / 2, y + h);
}
limitName = y + h;
} else {
--
GitLab