From 72654bafffd3c333a79a38e88080e13d7bc58ef6 Mon Sep 17 00:00:00 2001 From: mrbesen Date: Thu, 26 Oct 2017 13:24:12 +0200 Subject: [PATCH] improved readability in backfocus() --- src/mrbesen/cr/auto/clicker/Clicker.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/mrbesen/cr/auto/clicker/Clicker.java b/src/mrbesen/cr/auto/clicker/Clicker.java index fb88073..ee29495 100644 --- a/src/mrbesen/cr/auto/clicker/Clicker.java +++ b/src/mrbesen/cr/auto/clicker/Clicker.java @@ -208,18 +208,16 @@ public class Clicker implements Runnable{ private void backfocus(Robot bot) { if(backfocus) { - if(os == OSType.Windows | os == OSType.Linux) - bot.keyPress(KeyEvent.VK_ALT); - else//osx / unsupported - bot.keyPress(KeyEvent.VK_META); - + + int alt_key = ( os == OSType.Windows | os == OSType.Linux ? KeyEvent.VK_ALT : KeyEvent.VK_META); + + bot.keyPress(alt_key); + bot.keyPress(KeyEvent.VK_TAB); sleep(waittime); bot.keyRelease(KeyEvent.VK_TAB); - if(os == OSType.Windows | os == OSType.Linux) - bot.keyRelease(KeyEvent.VK_ALT); - else//osx / unsupported - bot.keyRelease(KeyEvent.VK_META); + + bot.keyRelease(alt_key); } } @@ -375,7 +373,7 @@ public class Clicker implements Runnable{ arena_view = c; break; } - if(mincolordistance < minimumdistance) + if(mincolordistance < minimumdistance)//enlarging min distance required mincolordistance = minimumdistance; System.out.println(colornum + ": "+c.getRed() + " " + c.getGreen() + " " + c.getBlue()); } @@ -396,7 +394,6 @@ public class Clicker implements Runnable{ unsupported } - public static Rectangle getRect(int x, int y) { return new Rectangle(x-2, y-2, 5, 5); }