Seth/HyperLap2D
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve sticky notes skin

Browse Source
This commit is contained in:
fgnm
2020-11-06 13:49:21 +01:00
parent ce9fd5533b
commit ea2e3caebe
6 changed files with 257 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
art/textures/pin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

art/textures/sticky-note.9.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 389 B

assets/style/uiskin.atlas
+188 -173
View File
File diff suppressed because it is too large Load Diff
assets/style/uiskin.json
+14
View File
@@ -188,6 +188,11 @@
titleFont: big-font,
background: panel,
titleFontColor: white
},
sticky-note: {
titleFont: big-font,
background: sticky-note,
titleFontColor: black
}
},
com.badlogic.gdx.scenes.scene2d.ui.ProgressBar$ProgressBarStyle: {
@@ -290,6 +295,12 @@
fontColor: white,
cursor: cursor
},
sticky-note: {
selection: selection,
font: default-font,
fontColor: black,
cursor: cursor
}
code-editor: {
errorBorder: border-error,
font: default-mono-font,
@@ -426,6 +437,9 @@
up: button-window-bg,
imageUp: icon-close-white
},
sticky-note-pin: {
up: pin
},
close-node-window: {
imageDown: close-node-pressed,
imageOver: close-node-hover,
assets/style/uiskin.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 57 KiB

src/main/java/games/rednblack/editor/view/ui/widget/actors/StickyNoteActor.java
+55 -16
View File
@@ -1,5 +1,7 @@
package games.rednblack.editor.view.ui.widget.actors;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.math.Interpolation;
import com.badlogic.gdx.math.Vector2;
@@ -8,9 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions;
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.utils.Align;
import com.kotcrab.vis.ui.widget.VisImageButton;
import com.kotcrab.vis.ui.widget.VisTextArea;
import com.kotcrab.vis.ui.widget.VisWindow;
import com.kotcrab.vis.ui.widget.*;
import games.rednblack.editor.HyperLap2DFacade;
import games.rednblack.editor.controller.commands.ModifyStickyNoteCommand;
import games.rednblack.editor.renderer.data.StickyNoteVO;
@@ -27,11 +27,17 @@ public class StickyNoteActor extends VisWindow {
private final Vector2 tmp = new Vector2();
private final VisTextArea contentArea;
private final HyperLap2DFacade facade = HyperLap2DFacade.getInstance();
private final VisImageButton pinButton;
private int resizeBorder = 8;
public StickyNoteActor(String id) {
super("", "default");
super("", "sticky-note");
pinButton = new VisImageButton("sticky-note-pin");
pinButton.setX(-pinButton.getWidth() / 2f);
pinButton.setY(-pinButton.getHeight() / 2f);
this.getTitleTable().addActor(pinButton);
setMoveListener();
this.id = id;
@@ -40,9 +46,9 @@ public class StickyNoteActor extends VisWindow {
setKeepWithinStage(false);
setResizable(true);
addCloseButton();
//addCloseButton();
contentArea = StandardWidgetsFactory.createTextArea();
contentArea = StandardWidgetsFactory.createTextArea("sticky-note");
contentArea.addListener(new ChangeListener() {
@Override
public void changed(ChangeEvent event, Actor actor) {
@@ -50,7 +56,21 @@ public class StickyNoteActor extends VisWindow {
facade.sendNotification(MsgAPI.ACTION_MODIFY_STICKY_NOTE, payload);
}
});
add(contentArea).grow();
contentArea.addListener(new InputListener() {
@Override
public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) {
return button == Input.Buttons.RIGHT || super.touchDown(event, x, y, pointer, button);
}
@Override
public void touchUp(InputEvent event, float x, float y, int pointer, int button) {
if (button == Input.Buttons.RIGHT) {
showPopupMenu();
}
}
});
add(contentArea).padTop(5).padLeft(5).grow();
setOrigin(Align.topLeft);
}
@Override
@@ -85,11 +105,11 @@ public class StickyNoteActor extends VisWindow {
public void show(Group parent) {
parent.addActor(this);
float scale = Sandbox.getInstance().getZoomPercent() / 100f;
addAction(Actions.sequence(
Actions.scaleTo(0, 0),
Actions.scaleTo(scale > 1 ? 1f : scale, scale > 1 ? 1f : scale, .35f, Interpolation.swingOut)
));
Action action = Actions.parallel(Actions.parallel(Actions.alpha(0), Actions.alpha(1, 0.125f)),
Actions.sequence(Actions.rotateBy(20),
Actions.rotateBy(-35, .25f, Interpolation.smoother),
Actions.rotateBy(15, .25f, Interpolation.swingOut)));
addAction(action);
}
/**
@@ -196,7 +216,7 @@ public class StickyNoteActor extends VisWindow {
}
public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) {
if (button == 0) {
if (button == Input.Buttons.LEFT) {
updateEdge(x, y);
dragging = edge != 0;
startX = x;
@@ -208,9 +228,13 @@ public class StickyNoteActor extends VisWindow {
}
public void touchUp (InputEvent event, float x, float y, int pointer, int button) {
dragging = false;
StickyNoteVO payload = ModifyStickyNoteCommand.payload(StickyNoteActor.this);
facade.sendNotification(MsgAPI.ACTION_MODIFY_STICKY_NOTE, payload);
if (button == Input.Buttons.LEFT) {
dragging = false;
StickyNoteVO payload = ModifyStickyNoteCommand.payload(StickyNoteActor.this);
facade.sendNotification(MsgAPI.ACTION_MODIFY_STICKY_NOTE, payload);
} else if (button == Input.Buttons.RIGHT) {
showPopupMenu();
}
}
public void touchDragged (InputEvent event, float x, float y, int pointer) {
@@ -273,4 +297,19 @@ public class StickyNoteActor extends VisWindow {
}
});
}
private void showPopupMenu() {
PopupMenu popupMenu = new PopupMenu();
MenuItem rename = new MenuItem("Remove note");
rename.addListener(
new ClickListener(Input.Buttons.LEFT) {
@Override
public void clicked(InputEvent event, float x, float y) {
facade.sendNotification(MsgAPI.ACTION_REMOVE_STICKY_NOTE, id);
}
});
popupMenu.addItem(rename);
popupMenu.setPosition(Gdx.input.getX(), Gdx.graphics.getHeight() - Gdx.input.getY() - popupMenu.getHeight());
Sandbox.getInstance().getUIStage().addActor(popupMenu);
}
}