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

v2.3.0: adjusted wndTabbed active tab behaviour to prevent eating inputs

Browse Source
This commit is contained in:
Evan Debenham
2024-01-14 15:57:08 -05:00
parent b9d54e3f6f
commit 69e5fe5d08
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java
+5 -10
View File
@@ -33,7 +33,6 @@ import com.watabou.input.KeyEvent;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
import com.watabou.noosa.Image; import com.watabou.noosa.Image;
import com.watabou.noosa.NinePatch; import com.watabou.noosa.NinePatch;
import com.watabou.noosa.PointerArea;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.watabou.utils.RectF; import com.watabou.utils.RectF;
import com.watabou.utils.Signal; import com.watabou.utils.Signal;
@@ -169,10 +168,6 @@ public class WndTabbed extends Window {
protected NinePatch bg; protected NinePatch bg;
{
hotArea.blockLevel = PointerArea.ALWAYS_BLOCK;
}
@Override @Override
protected void layout() { protected void layout() {
super.layout(); super.layout();
@@ -186,9 +181,7 @@ public class WndTabbed extends Window {
protected void select( boolean value ) { protected void select( boolean value ) {
active = !(selected = value); selected = value;
if (!active) killTooltip();
if (bg != null) { if (bg != null) {
remove( bg ); remove( bg );
@@ -204,8 +197,10 @@ public class WndTabbed extends Window {
@Override @Override
protected void onClick() { protected void onClick() {
Sample.INSTANCE.play( Assets.Sounds.CLICK, 0.7f, 0.7f, 1.2f ); if (!selected) {
WndTabbed.this.onClick( this ); Sample.INSTANCE.play(Assets.Sounds.CLICK, 0.7f, 0.7f, 1.2f);
WndTabbed.this.onClick(this);
}
} }
} }