From 1cde3ddc2a33d34f229ad65cfa03286e7b595696 Mon Sep 17 00:00:00 2001
From: Arthur VUAGNIAUX <arthur.vuagniaux@telecom-paristech.fr>
Date: Mon, 17 Sep 2018 14:33:53 +0200
Subject: [PATCH] Issue #73: Hidden component not clickable
But DIPLODOCUS IDs still appear
---
src/main/java/myutil/TraceManager.java | 4 ++--
src/main/java/ui/TGComponent.java | 4 ++++
ttool/launch_configurations/config.xml | 1 -
3 files changed, 6 insertions(+), 3 deletions(-)
mode change 100755 => 100644 ttool/launch_configurations/config.xml
diff --git a/src/main/java/myutil/TraceManager.java b/src/main/java/myutil/TraceManager.java
index 185432cd4b..0521f251c3 100644
--- a/src/main/java/myutil/TraceManager.java
+++ b/src/main/java/myutil/TraceManager.java
@@ -58,10 +58,10 @@ public class TraceManager {
public static int devPolicy = TO_CONSOLE;
public static int errPolicy = TO_CONSOLE;
- public static void addDev(String _s) {
+ public static void addDev(String res) {
switch(devPolicy) {
case TO_CONSOLE:
- System.out.println(_s);
+ System.out.println(res);
break;
case TO_DEVNULL:
break;
diff --git a/src/main/java/ui/TGComponent.java b/src/main/java/ui/TGComponent.java
index 644262db99..73f85fa02d 100755
--- a/src/main/java/ui/TGComponent.java
+++ b/src/main/java/ui/TGComponent.java
@@ -1533,12 +1533,16 @@ public abstract class TGComponent extends AbstractCDElement implements /*CDElem
return !((getX() < x1) || (getY() < y1) || ((getX() + this.width) > (x1 + width)) || ((getY() + this.height) > (y1 + height)));
}
+ //Isssue #73: Hidden component still clickable
public final void drawInternalComponents(Graphics g) {
for (int i = 0; i < nbInternalTGComponent; i++) {
//ColorManager.setColor(g, tgcomponent[i].getState(), 0);
if (!tgcomponent[i].isHidden()) {
tgcomponent[i].draw(g);
+ tgcomponent[i].setHidden(false);
}
+ else
+ tgcomponent[i].setHidden(true);
}
}
diff --git a/ttool/launch_configurations/config.xml b/ttool/launch_configurations/config.xml
old mode 100755
new mode 100644
index 60053fa0bf..de5ba95d29
--- a/ttool/launch_configurations/config.xml
+++ b/ttool/launch_configurations/config.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
-
<TURTLECONFIGURATION>
<RTLHost data="localhost" />
<RTLPath data="/packages/RT-LOTOS.0.12/bin/rtl" />
--
GitLab