From 4cc7b15f8e077031307d203da7fde56e396a4468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Przemys=C5=82aw=20Pluta?= Date: Sun, 14 Mar 2021 10:43:56 +0100 Subject: [PATCH] Perform a little refactor of VOptionChoice --- .../api/game/gui/component/VOptionChoice.java | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VOptionChoice.java b/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VOptionChoice.java index e547ffcf..215f8407 100644 --- a/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VOptionChoice.java +++ b/api/src/main/java/com/bartlomiejpluta/base/api/game/gui/component/VOptionChoice.java @@ -33,23 +33,17 @@ public class VOptionChoice extends VLayout { return; } - if (event.getKey() == Key.KEY_DOWN) { - if (ACTIONS.contains(event.getAction())) { - blurAll(); - selected = (++selected) % children.size(); - children.get(selected).focus(); - event.consume(); - } - } else if (event.getKey() == Key.KEY_UP) { - if (ACTIONS.contains(event.getAction())) { - blurAll(); - var size = children.size(); - selected = (((--selected) % size) + size) % size; - children.get(selected).focus(); - event.consume(); - } - } else { - + if (event.getKey() == Key.KEY_DOWN && ACTIONS.contains(event.getAction())) { + blurAll(); + selected = (++selected) % children.size(); + children.get(selected).focus(); + event.consume(); + } else if (event.getKey() == Key.KEY_UP && ACTIONS.contains(event.getAction())) { + blurAll(); + var size = children.size(); + selected = (((--selected) % size) + size) % size; + children.get(selected).focus(); + event.consume(); } }