(v2) Scene editor: some fixes.

Author: PhaserEditor2D

source/v2/phasereditor/phasereditor.scene.ui/src/phasereditor/scene/ui/editor/properties/AnimationsSection.java

@@ -70,6 +70,15 @@ public Control createContent(Composite parent) {
 		var comp = new Composite(parent, 0);
 		comp.setLayout(new GridLayout(2, false));
 
+		
+		_animCanvas = new AnimationPreviewComp(comp, 0);
+		{
+			var gd = new GridData(GridData.FILL_BOTH);
+			gd.horizontalSpan = 2;
+			gd.heightHint = 200;
+			_animCanvas.setLayoutData(gd);
+		}
+		
 		_browseBtn = new Button(comp, 0);
 		_browseBtn.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
 		_browseBtn.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> {
@@ -80,13 +89,6 @@ public Control createContent(Composite parent) {
 		_clearBtn.setText("Clear");
 		_clearBtn.addSelectionListener(SelectionListener.widgetSelectedAdapter(e -> clearAnimation()));
 
-		_animCanvas = new AnimationPreviewComp(comp, 0);
-		{
-			var gd = new GridData(GridData.FILL_BOTH);
-			gd.horizontalSpan = 2;
-			gd.heightHint = 200;
-			_animCanvas.setLayoutData(gd);
-		}
 
 		return comp;
 	}

source/v2/phasereditor/phasereditor.scene.ui/src/phasereditor/scene/ui/editor/properties/BitmapTextSection.java

@@ -85,17 +85,21 @@ public void run() {
 				getModels().forEach(model -> {
 					BitmapTextComponent.set_align(model, _align);
 				});
-
+				
 			}, getModels(), true);
 
 			getEditor().setDirty(true);
 			getEditor().getScene().redraw();
-
+			
+			updateAlignActionsState();
 		}
 	}
 
 	@Override
 	public Control createContent(Composite parent) {
+		
+		createActions();
+		
 		var comp = new Composite(parent, SWT.NONE);
 		comp.setLayout(new GridLayout(2, false));
 
@@ -136,8 +140,6 @@ public Control createContent(Composite parent) {
 
 		}
 
-		update_UI_from_Model();
-
 		return comp;
 	}
 
@@ -206,12 +208,6 @@ public void run() {
 	@Override
 	public void fillToolbar(ToolBarManager manager) {
 
-		_alignLeftAction = new AlignAction("ALIGN_LEFT", IMG_TEXT_ALIGN_LEFT, BitmapTextComponent.ALIGN_LEFT);
-		_alignMiddleAction = new AlignAction("ALIGN_MIDDLE", IMG_TEXT_ALIGN_CENTER, BitmapTextComponent.ALIGN_MIDDLE);
-		_alignRightAction = new AlignAction("ALIGN_RIGHT", IMG_TEXT_ALIGN_RIGHT, BitmapTextComponent.ALIGN_RIGHT);
-
-		_fontAction = new FontAction();
-
 		manager.add(_alignLeftAction);
 		manager.add(_alignMiddleAction);
 		manager.add(_alignRightAction);
@@ -226,13 +222,23 @@ public void fillToolbar(ToolBarManager manager) {
 		manager.add(new FontSizeAction(false));
 	}
 
+	private void createActions() {
+		_alignLeftAction = new AlignAction("ALIGN_LEFT", IMG_TEXT_ALIGN_LEFT, BitmapTextComponent.ALIGN_LEFT);
+		_alignMiddleAction = new AlignAction("ALIGN_MIDDLE", IMG_TEXT_ALIGN_CENTER, BitmapTextComponent.ALIGN_MIDDLE);
+		_alignRightAction = new AlignAction("ALIGN_RIGHT", IMG_TEXT_ALIGN_RIGHT, BitmapTextComponent.ALIGN_RIGHT);
+
+		_fontAction = new FontAction();
+	}
+
 	@SuppressWarnings("boxing")
 	@Override
 	public void update_UI_from_Model() {
 		var models = getModels();
 
+		String flatValues_to_String = flatValues_to_String(models.stream().map(model -> BitmapTextComponent.get_fontSize(model)));
+		
 		_fontSizeText
-				.setText(flatValues_to_String(models.stream().map(model -> BitmapTextComponent.get_fontSize(model))));
+				.setText(flatValues_to_String);
 
 		_letterSpacingText.setText(
 				flatValues_to_String(models.stream().map(model -> BitmapTextComponent.get_letterSpacing(model))));
@@ -242,10 +248,7 @@ public void update_UI_from_Model() {
 			return asset == null ? "<null>" : asset.getKey();
 		})));
 
-		for (var action : new AlignAction[] { _alignLeftAction, _alignMiddleAction, _alignRightAction }) {
-			action.setChecked(flatValues_to_boolean(
-					models.stream().map(model -> BitmapTextComponent.get_align(model) == action.getAlign())));
-		}
+		updateAlignActionsState();
 
 		listenInt(_fontSizeText, value -> {
 
@@ -266,12 +269,20 @@ public void update_UI_from_Model() {
 				getModels().stream().forEach(model -> {
 					BitmapTextComponent.set_letterSpacing(model, value);
 				});
-			}, getModels());
+			}, getModels(), true);
 
 			getEditor().setDirty(true);
 
 		});
 
 	}
 
+	@SuppressWarnings("boxing")
+	void updateAlignActionsState() {
+		for (var action : new AlignAction[] { _alignLeftAction, _alignMiddleAction, _alignRightAction }) {
+			action.setChecked(flatValues_to_boolean(
+					getModels().stream().map(model -> BitmapTextComponent.get_align(model) == action.getAlign())));
+		}
+	}
+
 }