From 8bcc60fd5396f6da09010194af0c20c3a3e068ec Mon Sep 17 00:00:00 2001 From: Andrew Fulton Date: Sun, 10 Feb 2019 16:30:50 -0600 Subject: [PATCH 1/5] client: add right click only tooltips toggle A toggle for right-click-only option tooltips has been added to MouseHighlightConfig Fixed #7770 --- .../plugins/mousehighlight/MouseHighlightConfig.java | 8 ++++++++ .../plugins/mousehighlight/MouseHighlightOverlay.java | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java index 1c23e334cd..467e7d5a80 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java @@ -52,4 +52,12 @@ public interface MouseHighlightConfig extends Config { return true; } + + @ConfigItem( + position = 2, + keyName = "rightclickoptionTooltip", + name = "Right Click Option Tooltips", + description = "Whether or not tooltips are shown for options that right-click only." + ) + default boolean isRightClickTooltipEnabled() { return false; } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java index e7e12580cd..bbdcbc8a3e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java @@ -75,7 +75,7 @@ class MouseHighlightOverlay extends Overlay String option = menuEntry.getOption(); int type = menuEntry.getType(); - if (type == MenuAction.RUNELITE_OVERLAY.getId() || type == MenuAction.EXAMINE_ITEM_BANK_EQ.getId()) + if (!config.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type)) { // These are always right click only return null; @@ -136,4 +136,9 @@ class MouseHighlightOverlay extends Overlay tooltipManager.addFront(new Tooltip(option + (Strings.isNullOrEmpty(target) ? "" : " " + target))); return null; } + + private boolean isMenuActionRightClickOnly(int type) { + return type == MenuAction.RUNELITE_OVERLAY.getId() + || type == MenuAction.EXAMINE_ITEM_BANK_EQ.getId(); + } } From ef712a1f9a5330db0eeae7851adcc88ef42638aa Mon Sep 17 00:00:00 2001 From: Andrew Fulton Date: Sun, 10 Feb 2019 16:58:30 -0600 Subject: [PATCH 2/5] Fix checkstyle errors --- .../client/plugins/mousehighlight/MouseHighlightConfig.java | 5 ++++- .../client/plugins/mousehighlight/MouseHighlightOverlay.java | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java index 467e7d5a80..71c82e52df 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java @@ -59,5 +59,8 @@ public interface MouseHighlightConfig extends Config name = "Right Click Option Tooltips", description = "Whether or not tooltips are shown for options that right-click only." ) - default boolean isRightClickTooltipEnabled() { return false; } + default boolean isRightClickTooltipEnabled() + { + return false; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java index bbdcbc8a3e..80e9c969af 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java @@ -137,7 +137,8 @@ class MouseHighlightOverlay extends Overlay return null; } - private boolean isMenuActionRightClickOnly(int type) { + private boolean isMenuActionRightClickOnly(int type) + { return type == MenuAction.RUNELITE_OVERLAY.getId() || type == MenuAction.EXAMINE_ITEM_BANK_EQ.getId(); } From 3dea92c9422f4966c97188bf53c48d803b75e0c8 Mon Sep 17 00:00:00 2001 From: Andrew Fulton Date: Mon, 11 Feb 2019 17:39:06 -0600 Subject: [PATCH 3/5] Format MouseHighlightConfig * Following runelite coding conventions, removed extra tabs --- .../plugins/mousehighlight/MouseHighlightConfig.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java index 71c82e52df..aee8d840e2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java @@ -54,10 +54,10 @@ public interface MouseHighlightConfig extends Config } @ConfigItem( - position = 2, - keyName = "rightclickoptionTooltip", - name = "Right Click Option Tooltips", - description = "Whether or not tooltips are shown for options that right-click only." + position = 2, + keyName = "rightclickoptionTooltip", + name = "Right Click Option Tooltips", + description = "Whether or not tooltips are shown for options that right-click only." ) default boolean isRightClickTooltipEnabled() { From 32d87ecb832d1494e6ab2146f2beb2d524403623 Mon Sep 17 00:00:00 2001 From: Andrew Fulton Date: Mon, 11 Feb 2019 17:46:56 -0600 Subject: [PATCH 4/5] Enable right click tooltips by default --- .../client/plugins/mousehighlight/MouseHighlightConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java index aee8d840e2..fa8107577e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightConfig.java @@ -61,6 +61,6 @@ public interface MouseHighlightConfig extends Config ) default boolean isRightClickTooltipEnabled() { - return false; + return true; } } From 9997a03d76d39087fa104cabfc6504880691136d Mon Sep 17 00:00:00 2001 From: Andrew Fulton Date: Mon, 11 Feb 2019 17:52:33 -0600 Subject: [PATCH 5/5] Always return null for RUNELITE_OVERLAY's --- .../mousehighlight/MouseHighlightOverlay.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java index 80e9c969af..eeb48c5642 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java @@ -75,9 +75,8 @@ class MouseHighlightOverlay extends Overlay String option = menuEntry.getOption(); int type = menuEntry.getType(); - if (!config.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type)) + if (shouldNotRenderMenuAction(type)) { - // These are always right click only return null; } @@ -137,9 +136,14 @@ class MouseHighlightOverlay extends Overlay return null; } - private boolean isMenuActionRightClickOnly(int type) + private boolean shouldNotRenderMenuAction(int type) { return type == MenuAction.RUNELITE_OVERLAY.getId() - || type == MenuAction.EXAMINE_ITEM_BANK_EQ.getId(); + || (!config.isRightClickTooltipEnabled() && isMenuActionRightClickOnly(type)); + } + + private boolean isMenuActionRightClickOnly(int type) + { + return type == MenuAction.EXAMINE_ITEM_BANK_EQ.getId(); } }