Commit 8aa690d0 authored by Claes Sjofors's avatar Claes Sjofors

Java Ge bugfix in Invisible, forder and window

parent 01d416e6
...@@ -2488,7 +2488,7 @@ public class Dyn { ...@@ -2488,7 +2488,7 @@ public class Dyn {
public int connect(GlowArrayElem o) { public int connect(GlowArrayElem o) {
if ( attribute.toLowerCase().startsWith("$cmd(")) { if ( attribute != null && attribute.toLowerCase().startsWith("$cmd(")) {
cmd = true; cmd = true;
int idx = attribute.lastIndexOf(')'); int idx = attribute.lastIndexOf(')');
if ( idx != -1 && idx > 5) if ( idx != -1 && idx > 5)
......
...@@ -93,7 +93,7 @@ public class GrowFolder extends GrowWindow { ...@@ -93,7 +93,7 @@ public class GrowFolder extends GrowWindow {
text_color_drawtype = Integer.valueOf(token.nextToken()); text_color_drawtype = Integer.valueOf(token.nextToken());
break; break;
case Glow.eSave_GrowFolder_header_height: case Glow.eSave_GrowFolder_header_height:
header_height = Integer.valueOf(token.nextToken()); header_height = Double.valueOf(token.nextToken());
break; break;
case Glow.eSave_GrowFolder_color_selected: case Glow.eSave_GrowFolder_color_selected:
color_selected = Integer.valueOf(token.nextToken()); color_selected = Integer.valueOf(token.nextToken());
...@@ -376,7 +376,7 @@ public class GrowFolder extends GrowWindow { ...@@ -376,7 +376,7 @@ public class GrowFolder extends GrowWindow {
super.update_attributes(); super.update_attributes();
} catch ( Exception e) { } catch ( Exception e) {
System.out.println( "IOException GrowWindow"); System.out.println( "IOException GrowFolder");
} }
} }
...@@ -492,7 +492,7 @@ public class GrowFolder extends GrowWindow { ...@@ -492,7 +492,7 @@ public class GrowFolder extends GrowWindow {
} }
cmn.gdraw.polyline( p, 4, drawtype, idx, 0); cmn.gdraw.polyline( p, 4, drawtype, idx, 0);
if ( text_idx >= 0) { if ( text_idx >= 0 && folder_text[i] != null) {
cmn.gdraw.text( x + h/2, ll_y + h - 2, cmn.gdraw.text( x + h/2, ll_y + h - 2,
folder_text[i], text_drawtype, text_color_drawtype, folder_text[i], text_drawtype, text_color_drawtype,
text_idx, highlight, 0, Glow.eFont_Helvetica, tsize, 0); text_idx, highlight, 0, Glow.eFont_Helvetica, tsize, 0);
......
...@@ -527,7 +527,8 @@ public class GrowWindow extends GrowRect implements GrowScrollBarIfc { ...@@ -527,7 +527,8 @@ public class GrowWindow extends GrowRect implements GrowScrollBarIfc {
file_name = input_file_name; file_name = input_file_name;
new_ctx(); new_ctx();
windowCmn.ctx.traceConnect(); if ( windowCmn != null)
windowCmn.ctx.traceConnect();
cmn.gdraw.reset_clip_rectangle(); cmn.gdraw.reset_clip_rectangle();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment