konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.3.0: fixed errors with left click assignment in WndKeyBindings

Browse Source
This commit is contained in:
Evan Debenham
2022-06-02 16:12:23 -04:00
parent 0911953ffa
commit 833237eab8
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/assets/messages/windows/windows.properties
+1
View File
@@ -144,6 +144,7 @@ windows.wndkeybindings$wndchangebinding.changed_bind=New binding: _%s_
windows.wndkeybindings$wndchangebinding.warning=This key will be unbound from _%s_. windows.wndkeybindings$wndchangebinding.warning=This key will be unbound from _%s_.
windows.wndkeybindings$wndchangebinding.error=This key is already bound to this action. windows.wndkeybindings$wndchangebinding.error=This key is already bound to this action.
windows.wndkeybindings$wndchangebinding.unbind=Unbind Key windows.wndkeybindings$wndchangebinding.unbind=Unbind Key
windows.wndkeybindings$wndchangebinding.cant_unbind=You must have at least one key bound to this action.
windows.wndkeybindings$wndchangebinding.confirm=Confirm windows.wndkeybindings$wndchangebinding.confirm=Confirm
windows.wndkeybindings$wndchangebinding.cancel=Cancel windows.wndkeybindings$wndchangebinding.cancel=Cancel
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndKeyBindings.java
+19 -3
View File
@@ -33,8 +33,10 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.Window;
import com.watabou.input.GameAction; import com.watabou.input.GameAction;
import com.watabou.input.KeyBindings; import com.watabou.input.KeyBindings;
import com.watabou.input.KeyEvent; import com.watabou.input.KeyEvent;
import com.watabou.input.PointerEvent;
import com.watabou.noosa.ColorBlock; import com.watabou.noosa.ColorBlock;
import com.watabou.noosa.ui.Component; import com.watabou.noosa.ui.Component;
import com.watabou.utils.PointF;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@@ -344,7 +346,9 @@ public class WndKeyBindings extends Window {
private RenderedTextBlock changedKey; private RenderedTextBlock changedKey;
private RenderedTextBlock warnErr; private RenderedTextBlock warnErr;
private RedButton btnUnbind;
private RedButton btnConfirm; private RedButton btnConfirm;
private RedButton btnCancel;
public WndChangeBinding(GameAction action, BindingItem listItem, int keyAssigning, int curKeyCode, int otherBoundKey1, int otherBoundKey2 ){ public WndChangeBinding(GameAction action, BindingItem listItem, int keyAssigning, int curKeyCode, int otherBoundKey1, int otherBoundKey2 ){
@@ -379,10 +383,14 @@ public class WndKeyBindings extends Window {
warnErr.setRect(0, changedKey.bottom() + 10, WIDTH, warnErr.height()); warnErr.setRect(0, changedKey.bottom() + 10, WIDTH, warnErr.height());
add(warnErr); add(warnErr);
RedButton btnUnbind = new RedButton(Messages.get(this, "unbind"), 9){ btnUnbind = new RedButton(Messages.get(this, "unbind"), 9){
@Override @Override
protected void onClick() { protected void onClick() {
onSignal(new KeyEvent(0, true)); if (action == GameAction.LEFT_CLICK && listItem.key2 == 0 && listItem.key3 == 0){
ShatteredPixelDungeon.scene().addToFront(new WndMessage(Messages.get(WndChangeBinding.class, "cant_unbind")));
} else {
onSignal(new KeyEvent(0, true));
}
} }
}; };
btnUnbind.setRect(0, warnErr.bottom() + 6, WIDTH, BTN_HEIGHT); btnUnbind.setRect(0, warnErr.bottom() + 6, WIDTH, BTN_HEIGHT);
@@ -433,7 +441,7 @@ public class WndKeyBindings extends Window {
btnConfirm.enable(false); btnConfirm.enable(false);
add(btnConfirm); add(btnConfirm);
RedButton btnCancel = new RedButton(Messages.get(this, "cancel"), 9){ btnCancel = new RedButton(Messages.get(this, "cancel"), 9){
@Override @Override
protected void onClick() { protected void onClick() {
hide(); hide();
@@ -449,6 +457,14 @@ public class WndKeyBindings extends Window {
@Override @Override
public boolean onSignal(KeyEvent event) { public boolean onSignal(KeyEvent event) {
//ignore left clicks if we are pressing a button
if (KeyBindings.getActionForKey(event) == GameAction.LEFT_CLICK){
PointF hoverPos = camera().screenToCamera((int)PointerEvent.currentHoverPos().x, (int)PointerEvent.currentHoverPos().y);
if (btnUnbind.inside(hoverPos.x, hoverPos.y)) return true;
if (btnConfirm.inside(hoverPos.x, hoverPos.y)) return true;
if (btnCancel.inside(hoverPos.x, hoverPos.y)) return true;
}
if (event.pressed){ if (event.pressed){
changedKey.text(Messages.get(this, "changed_bind", KeyBindings.getKeyName(event.code))); changedKey.text(Messages.get(this, "changed_bind", KeyBindings.getKeyName(event.code)));
changedKey.setPos((WIDTH - changedKey.width())/2, changedKey.top()); changedKey.setPos((WIDTH - changedKey.width())/2, changedKey.top());