text fixes

Author: bladecoder

blade-engine/src/com/bladecoder/engine/actions/SayAction.java

@@ -51,7 +51,8 @@ public class SayAction extends BaseCallbackAction {
 					Type.STRING, true, "rectangle", new String[] { "rectangle",
 							"talk", "plain" }), 
 			new Param("animation",	"The animation to put when talking instead the default talk animation.",
-									Type.STRING)					
+									Type.STRING),
+			new Param("quee", "Quee the text if other text is showing or show it inmediatly.",Type.BOOLEAN, false, "false")
 	};
 
 	private String soundId;
@@ -64,6 +65,7 @@ public class SayAction extends BaseCallbackAction {
 	private String previousAnim = null;
 	private String talkAnim = null;
 	private Vector2 pos = null;
+	private boolean quee = false;
 
 	@Override
 	public void setParams(HashMap<String, String> params) {
@@ -93,6 +95,10 @@ public void setParams(HashMap<String, String> params) {
 		if (params.get("pos") != null) {
 			pos = Param.parseVector2(params.get("pos"));
 		}
+		
+		if (params.get("quee") != null) {
+			quee = Boolean.parseBoolean(params.get("quee"));
+		}
 	}
 
 	@Override
@@ -109,7 +115,6 @@ public boolean run(ActionCallback cb) {
 
 		if (text != null) {
 			float x, y;
-			boolean quee = false;
 
 			if (pos != null) {
 				x = pos.x;
@@ -195,6 +200,8 @@ public void write(Json json) {
 		json.writeValue("previousAnim", previousAnim);
 		json.writeValue("type", type);
 		json.writeValue("talkAnim", talkAnim);
+		json.writeValue("pos", pos);
+		json.writeValue("quee", quee);
 		super.write(json);
 	}
 
@@ -206,6 +213,8 @@ public void read(Json json, JsonValue jsonData) {
 		previousAnim = json.readValue("previousAnim", String.class, jsonData);
 		type = json.readValue("type", Text.Type.class, jsonData);
 		talkAnim = json.readValue("talkAnim", String.class, jsonData);
+		pos = json.readValue("pos", Vector2.class, jsonData);
+		quee = json.readValue("quee", Boolean.class, jsonData);
 		super.read(json, jsonData);
 	}
 

blade-engine/src/com/bladecoder/engine/ui/TextManagerUI.java

@@ -81,17 +81,16 @@ public void act(float delta) {
 				unprojectTmp.set(posx, posy, 0);
 				World.getInstance().getSceneCamera().scene2screen(sceneScreen.getViewport(), unprojectTmp);
 
-				if (currentSubtitle.type == Text.Type.TALK) {
-					layout.setText(style.font, currentSubtitle.str, currentSubtitle.color, maxTalkWidth, Align.center, true);
-				} else {
-					layout.setText(style.font, currentSubtitle.str, currentSubtitle.color, maxRectangleWidth, Align.center, true);
-				}
+				float maxWidth = currentSubtitle.type == Text.Type.TALK?maxTalkWidth:maxRectangleWidth;
+				
+				layout.setText(style.font, currentSubtitle.str, currentSubtitle.color, maxWidth, Align.center, true);
 
 				if (posx == TextManager.POS_CENTER || posx == TextManager.POS_SUBTITLE) {					
 					posx = (sceneScreen.getViewport().getScreenWidth() - layout.width)/2;
-					fontX = (sceneScreen.getViewport().getScreenWidth() - maxRectangleWidth)/2;
+					fontX = (sceneScreen.getViewport().getScreenWidth() - maxWidth)/2;
 				} else {
 					posx = unprojectTmp.x;
+					fontX = unprojectTmp.x;
 				}
 
 				if (posy == TextManager.POS_CENTER) {
@@ -103,6 +102,7 @@ public void act(float delta) {
 				}
 
 				setPosition(posx - PADDING, posy - PADDING);
+				setSize(layout.width + PADDING * 2, layout.height + PADDING * 2);
 
 				if (currentSubtitle.type == Text.Type.TALK) {
 					if (style.talkBubble != null) {
@@ -111,20 +111,21 @@ public void act(float delta) {
 
 					setX(getX() - layout.width / 2);
 
-					fontX = posx - maxTalkWidth / 2;
-				}
-
-				setSize(layout.width + PADDING * 2, layout.height + PADDING * 2);
-				
-				// check if the text exits the screen
-				if (getX() < 0) {
-					setX(0);
-				} else if (getX() + getWidth() > sceneScreen.getViewport().getScreenWidth()) {
-					setX(sceneScreen.getViewport().getScreenWidth() - getWidth());
-				}
+					fontX = posx - maxWidth / 2;
+					
+					// check if the text exits the screen
+					if (getX() < 0 && getX() > -getWidth()) {
+						setX(0);
+						fontX = getX() + PADDING;
+					} else if (getX() + getWidth() > sceneScreen.getViewport().getScreenWidth() && 
+							getX() + getWidth() < sceneScreen.getViewport().getScreenWidth() + getWidth()) {
+						setX(sceneScreen.getViewport().getScreenWidth() - getWidth());
+						fontX = sceneScreen.getViewport().getScreenWidth() - layout.width / 2 - PADDING - maxWidth / 2;
+					}
 
-				if (getY() + getHeight() > sceneScreen.getViewport().getScreenHeight()) {
-					setY(sceneScreen.getViewport().getScreenHeight() - getHeight());
+					if (getY() + getHeight() > sceneScreen.getViewport().getScreenHeight()) {
+						setY(sceneScreen.getViewport().getScreenHeight() - getHeight());
+					}
 				}
 			}
 		}
@@ -141,14 +142,11 @@ public void draw(Batch batch, float alpha) {
 				unprojectTmp.set(subtitle.x, subtitle.y, 0);
 				World.getInstance().getSceneCamera().scene2screen(sceneScreen.getViewport(), unprojectTmp);
 
-				float bubbleX = unprojectTmp.x  - style.talkBubble.getMinWidth() * scale / 2;
-				
+				float bubbleX = unprojectTmp.x  - style.talkBubble.getMinWidth() * scale / 2;				
 				float bubbleY = getY() - style.talkBubble.getMinHeight() * scale + 2;
-
-//				style.talkBubble.draw(batch, bubbleX, bubbleY, style.talkBubble.getMinWidth() * scale,
-//						style.talkBubble.getMinHeight() * scale);
 
-				style.talkBubble.draw(batch, bubbleX, bubbleY, style.talkBubble.getMinWidth() * scale,
+				if(bubbleX + style.talkBubble.getMinWidth() * scale < getX() + getWidth() && bubbleX > getX())
+					style.talkBubble.draw(batch, bubbleX, bubbleY, style.talkBubble.getMinWidth() * scale,
 						style.talkBubble.getMinHeight() * scale);
 			}