From 4e6ccb2ee0ffa3758a6fd71559e6b15a1c13f80e Mon Sep 17 00:00:00 2001
From: Moemoea Fierin <moemoea.fierin@epita.fr>
Date: Thu, 3 Oct 2019 11:51:49 +0200
Subject: [PATCH] [ZOOM] Issue #31: Diplodocus txt/icon will disappear if too
small
---
.../AvatarMethodologyDiagramName.java | 2 +-
.../DiplodocusMethodologyDiagramName.java | 2 ++
.../DiplodocusMethodologyDiagramReference.java | 15 ++++++++-------
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
index 1a27b06208..05010fcf2c 100755
--- a/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
+++ b/src/main/java/ui/avatarmethodology/AvatarMethodologyDiagramName.java
@@ -206,7 +206,7 @@ public class AvatarMethodologyDiagramName extends TGCScalableWithoutInternalComp
// Strings
String textDiagramRef = value;
int fontSize = g.getFont().getSize();
- boolean tooBig = !canTextGoInTheBox(g, fontSize, textDiagramRef, 0);
+ //boolean tooBig = !canTextGoInTheBox(g, fontSize, textDiagramRef, 0);
if (!isTextReadable(g) /*|| canTextGoInTheBox(g, fontSize, textDiagramRef, 0)*/)
return;
Font f = g.getFont();
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
index 99c0671445..e752983c17 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramName.java
@@ -126,6 +126,8 @@ public class DiplodocusMethodologyDiagramName extends TGCScalableWithoutInternal
@Override
public void internalDrawing(Graphics g)
{
+ if (!isTextReadable(g))
+ return;
// Strings
String textDiagramRef = value;
Font f = g.getFont();
diff --git a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
index f77f63c820..bd89490cde 100755
--- a/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
+++ b/src/main/java/ui/diplodocusmethodology/DiplodocusMethodologyDiagramReference.java
@@ -159,7 +159,7 @@ public abstract class DiplodocusMethodologyDiagramReference extends TGCScalableW
// }
final int fontSize = g.getFont().getSize();
- displayText = fontSize /*currentFontSize*/ >= minFontSize;
+ //displayText = fontSize /*currentFontSize*/ >= minFontSize;
// int h = g.getFontMetrics().getHeight();
@@ -175,18 +175,19 @@ public abstract class DiplodocusMethodologyDiagramReference extends TGCScalableW
//g.fillRect(x+1, y+1+lineHeight, width-1, height-1-lineHeight);
ColorManager.setColor(g, getState(), 0);
//if ((lineLength > 23) && (width > 23)){
-
+ if (!isTextReadable(g))
+ return;
// Issue #31
g.drawImage( scale( IconManager.img5100 ), x + width - scale( ICON_SIZE + 1 ), y + scale( 3 ), Color.yellow, null);
//}
-
- if (displayText) {
+
+
// size = currentFontSize - 2;
// g.setFont(myFontB);
- drawLimitedString(g, value, x, y + fontSize + 1 /*size + 3*/, width, 1);
- g.setFont(f);
- }
+ drawLimitedString(g, value, x, y + fontSize + 1 /*size + 3*/, width, 1);
+ g.setFont(f);
+
/*if (displayText) {
size = currentFontSize - 2;
--
GitLab