ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

config: Fix button state

Browse Source
This commit is contained in:
Owain van Brakel
2020-02-19 17:44:35 +01:00
parent 76b2537eb1
commit 8ec430486d
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
View File

@@ -90,7 +90,7 @@ import net.runelite.client.config.Keybind;
import net.runelite.client.config.ModifierlessKeybind; import net.runelite.client.config.ModifierlessKeybind;
import net.runelite.client.config.Range; import net.runelite.client.config.Range;
import net.runelite.client.config.Units; import net.runelite.client.config.Units;
import net.runelite.client.eventbus.Subscribe; import net.runelite.client.eventbus.EventBus;
import net.runelite.client.events.PluginChanged; import net.runelite.client.events.PluginChanged;
import net.runelite.client.plugins.PluginManager; import net.runelite.client.plugins.PluginManager;
import net.runelite.client.ui.ColorScheme; import net.runelite.client.ui.ColorScheme;
@@ -136,6 +136,9 @@ class ConfigPanel extends PluginPanel
@Inject @Inject
private ColorPickerManager colorPickerManager; private ColorPickerManager colorPickerManager;
@Inject
private EventBus eventBus;
private PluginConfigurationDescriptor pluginConfig = null; private PluginConfigurationDescriptor pluginConfig = null;
private final Map<String, JPanel> sectionWidgets = new HashMap<>(); private final Map<String, JPanel> sectionWidgets = new HashMap<>();
private final Map<String, JPanel> titleSectionWidgets = new HashMap<>(); private final Map<String, JPanel> titleSectionWidgets = new HashMap<>();
@@ -230,6 +233,7 @@ class ConfigPanel extends PluginPanel
} }
rebuild(false); rebuild(false);
eventBus.subscribe(PluginChanged.class, this, this::onPluginChanged);
} }
private void getSections(ConfigDescriptor cd) private void getSections(ConfigDescriptor cd)
@@ -1169,7 +1173,6 @@ class ConfigPanel extends PluginPanel
return new Dimension(PANEL_WIDTH + SCROLLBAR_WIDTH, super.getPreferredSize().height); return new Dimension(PANEL_WIDTH + SCROLLBAR_WIDTH, super.getPreferredSize().height);
} }
@Subscribe
public void onPluginChanged(PluginChanged event) public void onPluginChanged(PluginChanged event)
{ {
if (event.getPlugin() == this.pluginConfig.getPlugin()) if (event.getPlugin() == this.pluginConfig.getPlugin())

12
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
View File

@@ -43,7 +43,6 @@ import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
import javax.inject.Inject; import javax.inject.Inject;
@@ -70,7 +69,6 @@ import net.runelite.client.config.ConfigManager;
import net.runelite.client.config.OpenOSRSConfig; import net.runelite.client.config.OpenOSRSConfig;
import net.runelite.client.config.RuneLiteConfig; import net.runelite.client.config.RuneLiteConfig;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
import net.runelite.client.eventbus.Subscribe;
import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.ConfigChanged;
import net.runelite.client.events.ExternalPluginChanged; import net.runelite.client.events.ExternalPluginChanged;
import net.runelite.client.events.ExternalPluginsLoaded; import net.runelite.client.events.ExternalPluginsLoaded;
@@ -110,7 +108,6 @@ public class PluginListPanel extends PluginPanel
private final ConfigManager configManager; private final ConfigManager configManager;
private final PluginManager pluginManager; private final PluginManager pluginManager;
private final ScheduledExecutorService executorService;
private final Provider<ConfigPanel> configPanelProvider; private final Provider<ConfigPanel> configPanelProvider;
private final OpenOSRSConfig openOSRSConfig; private final OpenOSRSConfig openOSRSConfig;
private final List<PluginConfigurationDescriptor> fakePlugins = new ArrayList<>(); private final List<PluginConfigurationDescriptor> fakePlugins = new ArrayList<>();
@@ -142,7 +139,6 @@ public class PluginListPanel extends PluginPanel
public PluginListPanel( public PluginListPanel(
ConfigManager configManager, ConfigManager configManager,
PluginManager pluginManager, PluginManager pluginManager,
ScheduledExecutorService executorService,
Provider<ConfigPanel> configPanelProvider, Provider<ConfigPanel> configPanelProvider,
OpenOSRSConfig openOSRSConfig, OpenOSRSConfig openOSRSConfig,
EventBus eventBus) EventBus eventBus)
@@ -151,7 +147,6 @@ public class PluginListPanel extends PluginPanel
this.configManager = configManager; this.configManager = configManager;
this.pluginManager = pluginManager; this.pluginManager = pluginManager;
this.executorService = executorService;
this.configPanelProvider = configPanelProvider; this.configPanelProvider = configPanelProvider;
this.openOSRSConfig = openOSRSConfig; this.openOSRSConfig = openOSRSConfig;
@@ -186,13 +181,13 @@ public class PluginListPanel extends PluginPanel
}); });
eventBus.subscribe(ExternalPluginsLoaded.class, this, ignored -> { eventBus.subscribe(ExternalPluginsLoaded.class, this, ignored -> {
eventBus.subscribe(ExternalPluginChanged.class, this, ev -> { eventBus.subscribe(ExternalPluginChanged.class, this, ev -> SwingUtilities.invokeLater(this::rebuildPluginList));
SwingUtilities.invokeLater(this::rebuildPluginList);
});
SwingUtilities.invokeLater(this::rebuildPluginList); SwingUtilities.invokeLater(this::rebuildPluginList);
}); });
eventBus.subscribe(PluginChanged.class, this, this::onPluginChanged);
muxer = new MultiplexingPluginPanel(this); muxer = new MultiplexingPluginPanel(this);
searchBar = new IconTextField(); searchBar = new IconTextField();
@@ -475,7 +470,6 @@ public class PluginListPanel extends PluginPanel
configManager.setConfiguration(RUNELITE_GROUP_NAME, PINNED_PLUGINS_CONFIG_KEY, value); configManager.setConfiguration(RUNELITE_GROUP_NAME, PINNED_PLUGINS_CONFIG_KEY, value);
} }
@Subscribe
public void onPluginChanged(PluginChanged event) public void onPluginChanged(PluginChanged event)
{ {
SwingUtilities.invokeLater(this::refresh); SwingUtilities.invokeLater(this::refresh);