Skip to content

Commit 54166d6

Browse files
JavaSaBrJavaSaBr
committed
updated styles of influencer controls.
1 parent 4e3ae77 commit 54166d6

17 files changed

Lines changed: 258 additions & 254 deletions

‎resources/ui/css/custom_classes.bss‎

815 Bytes
Binary file not shown.

‎resources/ui/css/custom_classes.css‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,17 @@
583583
-fx-alignment: top-center;
584584
-fx-padding: 2px 6px 4px 4px;
585585
}
586+
.abstract-param-control-container-split-line {
587+
-fx-padding: 6px 0px 6px 0px;
588+
}
589+
590+
.abstract-param-control-container-split-line > .hbox {
591+
-fx-border-color: -var-border-color transparent transparent transparent,
592+
transparent transparent transparent transparent;
593+
-fx-border-insets: 0, 1 0 0 0;
594+
-fx-border-style: none;
595+
-fx-padding: 0px;
596+
}
586597

587598
.abstract-param-control {
588599
-fx-padding: 1px 0px 1px 0px;
@@ -620,7 +631,15 @@
620631
}
621632

622633
.abstract-param-control-number-label {
623-
-fx-min-width: 10px;
634+
-fx-min-width: 16px;
635+
-fx-pref-width: -fx-min-width;
636+
-fx-max-width: -fx-min-width;
637+
-fx-alignment: center-right;
638+
-fx-text-alignment: right;
639+
}
640+
641+
.abstract-param-control-number-label-2 {
642+
-fx-min-width: 30px;
624643
-fx-pref-width: -fx-min-width;
625644
-fx-max-width: -fx-min-width;
626645
-fx-alignment: center-right;
@@ -638,7 +657,7 @@
638657

639658
.abstract-param-control-influencer {
640659
-fx-alignment: top-center;
641-
-fx-spacing: 2px;
660+
-fx-spacing: 4px;
642661
}
643662

644663
.abstract-param-control-influencer > .vbox {

‎src/com/ss/editor/ui/control/model/property/builder/impl/Toneg0dParticleInfluencerPropertyBuilder.java‎

Lines changed: 47 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,22 @@
33
import com.jme3.math.Vector3f;
44
import com.ss.editor.Messages;
55
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
6-
import com.ss.editor.ui.control.model.property.control.particle.influencer.BooleanParticleInfluencerPropertyControl;
7-
import com.ss.editor.ui.control.model.property.control.particle.influencer.EnumParticleInfluencerEmitterPropertyControl;
8-
import com.ss.editor.ui.control.model.property.control.particle.influencer.FloatParticleInfluencerPropertyControl;
9-
import com.ss.editor.ui.control.model.property.control.particle.influencer.IntArrayParticleInfluencerPropertyControl;
10-
import com.ss.editor.ui.control.model.property.control.particle.influencer.PhysicsNodeListControl;
11-
import com.ss.editor.ui.control.model.property.control.particle.influencer.Vector3fParticleInfluencerPropertyControl;
12-
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.control.AlphaInfluencerControl;
13-
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.control.ColorInfluencerControl;
14-
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.control.DestinationInfluencerControl;
15-
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.control.RotationInfluencerControl;
16-
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.control.SizeInfluencerControl;
6+
import com.ss.editor.ui.control.model.property.control.particle.influencer.*;
7+
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.control.*;
178
import com.ss.editor.ui.control.property.builder.PropertyBuilder;
189
import com.ss.editor.ui.control.property.builder.impl.AbstractPropertyBuilder;
19-
10+
import com.ss.rlib.ui.util.FXUtils;
11+
import javafx.scene.layout.VBox;
2012
import org.jetbrains.annotations.NotNull;
2113
import org.jetbrains.annotations.Nullable;
22-
23-
import javafx.scene.layout.VBox;
24-
import com.ss.rlib.ui.util.FXUtils;
2514
import tonegod.emitter.influencers.InterpolatedParticleInfluencer;
2615
import tonegod.emitter.influencers.ParticleInfluencer;
27-
import tonegod.emitter.influencers.impl.AlphaInfluencer;
28-
import tonegod.emitter.influencers.impl.ColorInfluencer;
29-
import tonegod.emitter.influencers.impl.DestinationInfluencer;
30-
import tonegod.emitter.influencers.impl.GravityInfluencer;
16+
import tonegod.emitter.influencers.impl.*;
3117
import tonegod.emitter.influencers.impl.GravityInfluencer.GravityAlignment;
32-
import tonegod.emitter.influencers.impl.ImpulseInfluencer;
33-
import tonegod.emitter.influencers.impl.PhysicsInfluencer;
3418
import tonegod.emitter.influencers.impl.PhysicsInfluencer.CollisionReaction;
35-
import tonegod.emitter.influencers.impl.RadialVelocityInfluencer;
3619
import tonegod.emitter.influencers.impl.RadialVelocityInfluencer.RadialPullAlignment;
3720
import tonegod.emitter.influencers.impl.RadialVelocityInfluencer.RadialPullCenter;
3821
import tonegod.emitter.influencers.impl.RadialVelocityInfluencer.RadialUpAlignment;
39-
import tonegod.emitter.influencers.impl.RotationInfluencer;
40-
import tonegod.emitter.influencers.impl.SizeInfluencer;
41-
import tonegod.emitter.influencers.impl.SpriteInfluencer;
4222

4323
/**
4424
* The implementation of the {@link PropertyBuilder} to build property controls for {@link ParticleInfluencer}.
@@ -47,10 +27,19 @@
4727
*/
4828
public class Toneg0dParticleInfluencerPropertyBuilder extends AbstractPropertyBuilder<ModelChangeConsumer> {
4929

30+
@NotNull
5031
private static final GravityAlignment[] GRAVITY_ALIGNMENTS = GravityAlignment.values();
32+
33+
@NotNull
5134
private static final CollisionReaction[] COLLISION_REACTIONS = CollisionReaction.values();
35+
36+
@NotNull
5237
private static final RadialPullCenter[] RADIAL_PULL_CENTERS = RadialPullCenter.values();
38+
39+
@NotNull
5340
private static final RadialPullAlignment[] RADIAL_PULL_ALIGNMENTS = RadialPullAlignment.values();
41+
42+
@NotNull
5443
private static final RadialUpAlignment[] RADIAL_UP_ALIGNMENTS = RadialUpAlignment.values();
5544

5645
@NotNull
@@ -71,11 +60,12 @@ private Toneg0dParticleInfluencerPropertyBuilder() {
7160
}
7261

7362
@Override
74-
protected void buildForImpl(@NotNull final Object object, @Nullable final Object parent, @NotNull final VBox container,
75-
@NotNull final ModelChangeConsumer changeConsumer) {
63+
protected void buildForImpl(@NotNull final Object object, @Nullable final Object parent,
64+
@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer) {
7665

7766
if (!(object instanceof ParticleInfluencer) || parent == null) return;
7867

68+
7969
if (object instanceof AlphaInfluencer) {
8070
createControls(container, changeConsumer, (AlphaInfluencer) object, parent);
8171
} else if (object instanceof ColorInfluencer) {
@@ -111,8 +101,9 @@ protected void buildForImpl(@NotNull final Object object, @Nullable final Object
111101
* @param influencer the influencer
112102
* @param parent the parent
113103
*/
114-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
115-
@NotNull InterpolatedParticleInfluencer influencer, @NotNull final Object parent) {
104+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
105+
@NotNull final InterpolatedParticleInfluencer influencer,
106+
@NotNull final Object parent) {
116107

117108
final float fixedDuration = influencer.getFixedDuration();
118109

@@ -134,13 +125,15 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
134125
* @param influencer the influencer
135126
* @param parent the parent
136127
*/
137-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
138-
@NotNull final AlphaInfluencer influencer, @NotNull final Object parent) {
128+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
129+
@NotNull final AlphaInfluencer influencer, @NotNull final Object parent) {
139130

140131
final AlphaInfluencerControl influencerControl = new AlphaInfluencerControl(changeConsumer, influencer, parent);
141132
influencerControl.reload();
142133

143134
FXUtils.addToPane(influencerControl, container);
135+
136+
buildSplitLine(container);
144137
}
145138

146139
/**
@@ -151,8 +144,8 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
151144
* @param influencer the influencer
152145
* @param parent the parent
153146
*/
154-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
155-
@NotNull final ColorInfluencer influencer, @NotNull final Object parent) {
147+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
148+
@NotNull final ColorInfluencer influencer, @NotNull final Object parent) {
156149

157150
final boolean randomStartColor = influencer.isRandomStartColor();
158151

@@ -167,6 +160,7 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
167160
randomStartColorControl.setEditObject(influencer);
168161

169162
FXUtils.addToPane(colorControl, container);
163+
buildSplitLine(container);
170164
FXUtils.addToPane(randomStartColorControl, container);
171165
}
172166

@@ -178,11 +172,10 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
178172
* @param influencer the influencer
179173
* @param parent the parent
180174
*/
181-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
182-
@NotNull final SizeInfluencer influencer, @NotNull final Object parent) {
175+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
176+
@NotNull final SizeInfluencer influencer, @NotNull final Object parent) {
183177

184178
final boolean randomSize = influencer.isRandomSize();
185-
186179
final float randomSizeTolerance = influencer.getRandomSizeTolerance();
187180

188181
final SizeInfluencerControl sizeControl = new SizeInfluencerControl(changeConsumer, influencer, parent);
@@ -205,6 +198,7 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
205198
sizeVariationToleranceControl.setEditObject(influencer);
206199

207200
FXUtils.addToPane(sizeControl, container);
201+
buildSplitLine(container);
208202
FXUtils.addToPane(randomStartSizeControl, container);
209203
FXUtils.addToPane(sizeVariationToleranceControl, container);
210204
}
@@ -217,8 +211,8 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
217211
* @param influencer the influencer
218212
* @param parent the parent
219213
*/
220-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
221-
@NotNull final SpriteInfluencer influencer, @NotNull final Object parent) {
214+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
215+
@NotNull final SpriteInfluencer influencer, @NotNull final Object parent) {
222216

223217
final int[] frameSequence = influencer.getFrameSequence();
224218
final float fixedDuration = influencer.getFixedDuration();
@@ -272,8 +266,8 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
272266
* @param influencer the influencer
273267
* @param parent the parent
274268
*/
275-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
276-
@NotNull final DestinationInfluencer influencer, @NotNull final Object parent) {
269+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
270+
@NotNull final DestinationInfluencer influencer, @NotNull final Object parent) {
277271

278272
final boolean randomStartDestination = influencer.isRandomStartDestination();
279273

@@ -289,6 +283,7 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
289283
randomStartDestinationControl.setEditObject(influencer);
290284

291285
FXUtils.addToPane(influencerControl, container);
286+
buildSplitLine(container);
292287
FXUtils.addToPane(randomStartDestinationControl, container);
293288
}
294289

@@ -300,8 +295,8 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
300295
* @param influencer the influencer
301296
* @param parent the parent
302297
*/
303-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
304-
@NotNull final ImpulseInfluencer influencer, @NotNull final Object parent) {
298+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
299+
@NotNull final ImpulseInfluencer influencer, @NotNull final Object parent) {
305300

306301
final float chance = influencer.getChance();
307302
final float strength = influencer.getStrength();
@@ -344,8 +339,8 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
344339
* @param influencer the influencer
345340
* @param parent the parent
346341
*/
347-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
348-
@NotNull final GravityInfluencer influencer, @NotNull final Object parent) {
342+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
343+
@NotNull final GravityInfluencer influencer, @NotNull final Object parent) {
349344

350345
final Vector3f gravity = influencer.getGravity().clone();
351346
final GravityAlignment alignment = influencer.getAlignment();
@@ -389,8 +384,8 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
389384
* @param influencer the influencer
390385
* @param parent the parent
391386
*/
392-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
393-
@NotNull final PhysicsInfluencer influencer, @NotNull final Object parent) {
387+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
388+
@NotNull final PhysicsInfluencer influencer, @NotNull final Object parent) {
394389

395390
final CollisionReaction collisionReaction = influencer.getCollisionReaction();
396391
final float restitution = influencer.getRestitution();
@@ -414,9 +409,9 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
414409
restitutionControl.setApplyHandler(PhysicsInfluencer::setRestitution);
415410
restitutionControl.setEditObject(influencer);
416411

417-
FXUtils.addToPane(nodeListControl, container);
418412
FXUtils.addToPane(reactionControl, container);
419413
FXUtils.addToPane(restitutionControl, container);
414+
FXUtils.addToPane(nodeListControl, container);
420415
}
421416

422417
/**
@@ -427,8 +422,8 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
427422
* @param influencer the influencer
428423
* @param parent the parent
429424
*/
430-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
431-
@NotNull final RadialVelocityInfluencer influencer, @NotNull final Object parent) {
425+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
426+
@NotNull final RadialVelocityInfluencer influencer, @NotNull final Object parent) {
432427

433428
final RadialPullCenter pullCenter = influencer.getRadialPullCenter();
434429
final RadialPullAlignment pullAlignment = influencer.getRadialPullAlignment();
@@ -503,8 +498,8 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
503498
* @param influencer the influencer
504499
* @param parent the parent
505500
*/
506-
protected void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
507-
@NotNull final RotationInfluencer influencer, @NotNull final Object parent) {
501+
private void createControls(@NotNull final VBox container, @NotNull final ModelChangeConsumer changeConsumer,
502+
@NotNull final RotationInfluencer influencer, @NotNull final Object parent) {
508503

509504
final boolean randomDirection = influencer.isRandomDirection();
510505
final boolean randomSpeed = influencer.isRandomSpeed();
@@ -556,6 +551,7 @@ protected void createControls(@NotNull final VBox container, @NotNull final Mode
556551
randomStartRotationZControl.setEditObject(influencer);
557552

558553
FXUtils.addToPane(influencerControl, container);
554+
buildSplitLine(container);
559555
FXUtils.addToPane(randomDirectionControl, container);
560556
FXUtils.addToPane(randomSpeedControl, container);
561557
FXUtils.addToPane(randomStartRotationXControl, container);

‎src/com/ss/editor/ui/control/model/property/control/particle/influencer/ParticleInfluencerPropertyControl.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ public class ParticleInfluencerPropertyControl<D extends ParticleInfluencer, T>
3030
* @return the six object consumer
3131
*/
3232
@NotNull
33-
public static <D extends ParticleInfluencer, T> SixObjectConsumer<ModelChangeConsumer, D, String, T, T, BiConsumer<D, T>> newChangeHandler(@NotNull final Object parent) {
33+
public static <D extends ParticleInfluencer, T> SixObjectConsumer<ModelChangeConsumer, D, String, T, T, BiConsumer<D, T>>
34+
newChangeHandler(@NotNull final Object parent) {
3435
return (changeConsumer, object, propName, newValue, oldValue, handler) -> {
3536

3637
final ParticleInfluencerPropertyOperation<D, T> operation =

‎src/com/ss/editor/ui/control/model/property/control/particle/influencer/PhysicsNodeListControl.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public PhysicsNodeListControl(@NotNull final ModelChangeConsumer modelChangeCons
8686
/**
8787
* Create controls.
8888
*/
89-
protected void createControls() {
89+
private void createControls() {
9090

9191
final Label propertyNameLabel = new Label(getControlTitle() + ":");
9292

@@ -208,8 +208,6 @@ protected void fillControl(@NotNull final PhysicsInfluencer influencer, @NotNull
208208
label.prefWidthProperty().bind(widthProperty());
209209

210210
FXUtils.addToPane(label, root);
211-
212-
FXUtils.addClassTo(label, CSSClasses.SPECIAL_FONT_13);
213211
}
214212
}
215213

‎src/com/ss/editor/ui/control/model/property/control/particle/influencer/interpolation/control/RotationInfluencerControl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.jme3.math.Vector3f;
44
import com.ss.editor.Messages;
55
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
6-
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.element.RotationAndInterpolationElement;
6+
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.element.RotationInterpolationElement;
77

88
import org.jetbrains.annotations.NotNull;
99

@@ -64,7 +64,7 @@ protected void fillControl(@NotNull final RotationInfluencer influencer, @NotNul
6464

6565
for (int i = 0, length = speeds.size(); i < length; i++) {
6666

67-
final RotationAndInterpolationElement element = new RotationAndInterpolationElement(this, i);
67+
final RotationInterpolationElement element = new RotationInterpolationElement(this, i);
6868
element.prefWidthProperty().bind(widthProperty());
6969

7070
FXUtils.addToPane(element, root);

‎src/com/ss/editor/ui/control/model/property/control/particle/influencer/interpolation/control/SizeInfluencerControl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.jme3.math.Vector3f;
44
import com.ss.editor.Messages;
55
import com.ss.editor.model.undo.editor.ModelChangeConsumer;
6-
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.element.SizeAndInterpolationElement;
6+
import com.ss.editor.ui.control.model.property.control.particle.influencer.interpolation.element.SizeInterpolationElement;
77

88
import org.jetbrains.annotations.NotNull;
99

@@ -58,7 +58,7 @@ protected void fillControl(@NotNull final SizeInfluencer influencer, @NotNull fi
5858

5959
for (int i = 0, length = sizes.size(); i < length; i++) {
6060

61-
final SizeAndInterpolationElement element = new SizeAndInterpolationElement(this, i);
61+
final SizeInterpolationElement element = new SizeInterpolationElement(this, i);
6262
element.prefWidthProperty().bind(widthProperty());
6363

6464
FXUtils.addToPane(element, root);

0 commit comments

Comments
 (0)