Fix several UI bugs: inventory button doesn't hide, dialog not working well when autoselect one option and text doesn't show when returning to a scene without init

Author: bladecoder

adventure-editor/src/main/java/com/bladecoder/engineeditor/ui/EditVerbDialog.java

@@ -124,7 +124,7 @@ private void updateDesc() {
 				.getSelectedIndex();
 
 		if(i == -1) {
-			if(idStr.isEmpty())
+			if(idStr != null && idStr.isEmpty())
 				setInfo(DEFAULT_DESC);
 			else
 				setInfo(CUSTOM_VERB_DESC);

adventure-editor/src/main/resources/versions.properties

@@ -5,4 +5,4 @@ buildToolsVersion=27.0.3
 libgdxVersion=1.9.8
 roboVMGradlePluginVersion=2.3.3
 roboVMVersion=2.3.3
-version=2.1.0
+version=2.1.1-SNAPSHOT

blade-engine/src/com/bladecoder/engine/model/Scene.java

@@ -620,6 +620,9 @@ public void retrieveAssets() {
 
 		soundManager.retrieveAssets();
 		textManager.getVoiceManager().retrieveAssets();
+		
+		if (getWorld().getListener() != null)
+			getWorld().getListener().text(textManager.getCurrentText());
 	}
 
 	@Override

blade-engine/src/com/bladecoder/engine/model/World.java

@@ -543,6 +543,9 @@ public void setHeight(int height) {
 
 	public void showInventory(boolean b) {
 		getInventory().setVisible(b);
+		
+		if(listener != null)
+			listener.inventoryEnabled(b);
 	}
 
 	public String getCurrentInventory() {

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

@@ -30,6 +30,8 @@
 import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
 import com.badlogic.gdx.scenes.scene2d.utils.Drawable;
 import com.badlogic.gdx.utils.Align;
+import com.badlogic.gdx.utils.Timer;
+import com.badlogic.gdx.utils.Timer.Task;
 import com.bladecoder.engine.i18n.I18N;
 import com.bladecoder.engine.util.DPIUtils;
 
@@ -46,12 +48,12 @@ public class DialogUI extends ScrollPane {
 	private Button down;
 
 	private List<String> choices;
-	
+
 	private final UI ui;
 
 	public DialogUI(UI ui) {
 		super(new Table(ui.getSkin()), ui.getSkin());
-		
+
 		this.ui = ui;
 
 		setFadeScrollBars(true);
@@ -110,13 +112,13 @@ public void changed(ChangeEvent event, Actor actor) {
 			}
 		});
 	}
-	
+
 	@Override
-	public void setVisible (boolean visible) {
+	public void setVisible(boolean visible) {
 		super.setVisible(visible);
-		
-		if(visible) {
-			if(getParent() != null)
+
+		if (visible) {
+			if (getParent() != null)
 				show();
 		} else {
 			up.remove();
@@ -130,10 +132,20 @@ private void show() {
 		if (choices.size() == 0)
 			return;
 
-		else if (style.autoselect && choices.size() == 1) { 
+		else if (style.autoselect && choices.size() == 1) {
 			// If only has one option, autoselect it
-			select(0);
-			return;
+
+			// To work properly, delay the selection one frame to avoid select it before
+			// 'talkto' finished.
+			Timer.post(new Task() {
+
+				@Override
+				public void run() {
+					select(0);
+
+					return;
+				}
+			});
 		}
 
 		panel.clear();
@@ -195,7 +207,7 @@ static public class DialogUIStyle {
 		public Drawable background;
 
 		public TextButtonStyle textButtonStyle;
-		
+
 		// If only one option is visible, auto select it.
 		public boolean autoselect = true;
 

blade-engine/src/com/bladecoder/engine/ui/defaults/DefaultSceneScreen.java

@@ -348,6 +348,7 @@ public void cutMode(boolean value) {
 
 		@Override
 		public void inventoryEnabled(boolean value) {
+			inventoryUI.hide();
 			inventoryButton.setVisible(value);
 		}
 
@@ -1000,8 +1001,6 @@ public void show() {
 		ui.getWorld().setListener(worldListener);
 		ui.getWorld().resume();
 
-		textManagerUI.setText(ui.getWorld().getCurrentScene().getTextManager().getCurrentText());
-
 		updateUI();
 	}
 

gradle.properties

@@ -1,4 +1,4 @@
-version=2.1.0
+version=2.1.1-SNAPSHOT
 libgdxVersion=1.9.8
 roboVMVersion=2.3.3
 roboVMGradlePluginVersion=2.3.3