Fix autocompleteing combo boxes

NotToDisturb · Nov 29, 2020 · e097c62 · e097c62
1 parent 3357119
commit e097c62
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.idea/artifacts/Decomp_Trainer_Editor_jar.xml b/.idea/artifacts/Decomp_Trainer_Editor_jar.xml
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: me.disturbo.main.MainActivity
+
diff --git a/src/me/disturbo/ui/extensions/ComboBoxFiltered.java b/src/me/disturbo/ui/extensions/ComboBoxFiltered.java
@@ -62,7 +62,11 @@ private final void configFocus(){
             @Override
             public void focusGained(FocusEvent e) {
                 // Base case
-                if(!showAll.equals("")) setModel(new DefaultComboBoxModel(getFilteredElements(field.getText())));
+                if(!showAll.equals("")){
+                    String text = field.getText();
+                    setModel(new DefaultComboBoxModel(getFilteredElements(field.getText())));
+                    setSelectedItem(text);
+                }
                 setPopupVisible(true);
             }
 
@@ -103,7 +107,7 @@ private final void autocomplete(JTextField field){
         String[] filtered = getFilteredElements(text);
         if(filtered.length == 0) filtered = elements.toArray(new String[0]);
         if(!showAll.equals("")) setModel(new DefaultComboBoxModel(filtered));
-        setSelectedItem(filtered[0]);
+        setSelectedItem(this.elements.contains(text) ? text : filtered[0]);
     }
 
     private final String[] getFilteredElements(String text){

diff --git a/src/me/disturbo/ui/party/PartyMemberPanel.java b/src/me/disturbo/ui/party/PartyMemberPanel.java
@@ -165,6 +165,5 @@ public final void savePartyMemberData(PartyMember member){
             moves.add(keys.get(indexOfMove));
         }
         member.moves = moves;
-        System.out.println(member.species + " " + member.heldItem.equals(""));
     }
 }