feat: Enhance JColorPickerDialog focus handling and fix DynamicClassLoader JAR loading mechanism.

Author: teras

modules/core/src/main/java/com/panayotis/jubler/subs/style/gui/JColorPickerDialog.java

@@ -9,11 +9,12 @@
 import com.panayotis.jubler.JubFrame;
 import com.panayotis.jubler.subs.style.gui.tri.TriColorPickerButton;
 import com.panayotis.jubler.subs.style.gui.tri.TriObject;
-import static com.panayotis.jubler.i18n.I18N.__;
 
 import javax.swing.*;
 import java.awt.*;
 
+import static com.panayotis.jubler.i18n.I18N.__;
+
 public class JColorPickerDialog extends JWindow {
 
     private TriObject[] allButtons;
@@ -36,17 +37,24 @@ private void initComponents() {
             BorderFactory.createEmptyBorder(4, 4, 4, 4)
         ));
         panel.setBackground(UIManager.getColor("Panel.background"));
-        
+        panel.setFocusable(true);
+        panel.setRequestFocusEnabled(true);
+        panel.addFocusListener(new java.awt.event.FocusAdapter() {
+            public void focusLost(java.awt.event.FocusEvent evt) {
+                setVisible(false);
+            }
+        });
+
         add(panel);
-        
+
         addWindowFocusListener(new java.awt.event.WindowFocusListener() {
             public void windowGainedFocus(java.awt.event.WindowEvent evt) {
             }
             public void windowLostFocus(java.awt.event.WindowEvent evt) {
                 setVisible(false);
             }
         });
-        
+
         addFocusListener(new java.awt.event.FocusAdapter() {
             public void focusLost(java.awt.event.FocusEvent evt) {
                 setVisible(false);
@@ -56,9 +64,9 @@ public void focusLost(java.awt.event.FocusEvent evt) {
 
     private void updatePanel() {
         panel.removeAll();
-        
+
         String[] labels = {__("Primary"), __("Secondary"), __("Outline"), __("Shadow")};
-        
+
         for (int i = 0; i < allButtons.length; i++) {
             final int index = i;
             JLabel label = new JLabel(labels[i]);
@@ -70,6 +78,7 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
                     if (index != currentIndex) {
                         pickerButton.switchToColor(index);
                     }
+                    currentIndex = index;
                     setVisible(false);
                 }
                 public void mouseEntered(java.awt.event.MouseEvent evt) {
@@ -84,7 +93,7 @@ public void mouseExited(java.awt.event.MouseEvent evt) {
             });
             panel.add(label);
         }
-        
+
         pack();
     }
 
@@ -97,6 +106,8 @@ public void showBelow(JComponent component) {
         Point location = component.getLocationOnScreen();
         setLocation(location.x, location.y + component.getHeight());
         setVisible(true);
-        requestFocus();
+        if (!panel.requestFocusInWindow()) {
+            panel.requestFocus();
+        }
     }
 }

modules/launcher/src/main/java/com/panayotis/jubler/os/DynamicClassLoader.java

@@ -15,6 +15,7 @@ public class DynamicClassLoader extends URLClassLoader {
 
     public DynamicClassLoader() {
         super(new URL[]{}, DynamicClassLoader.class.getClassLoader());
+        loadJarsFromDirectory(SystemFileFinder.AppPath);
         loadJarsFromDirectory(new File(SystemDependent.getAppSupportDirPath(), "plugins"));
     }