Bug Fix: Fixed settings being saved while columns was being moved (no…

…w only save when the move is completed)
GoldenGnu · Nov 4, 2021 · afc9c25 · afc9c25
1 parent 41ac65c
commit afc9c25
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/shared/filter/FilterPanel.java b/src/main/java/net/nikr/eve/jeveasset/gui/shared/filter/FilterPanel.java
@@ -300,16 +300,15 @@ protected void updateColumns() {
 				dateColumns.add(object);
 			}
 		}
+		jColumn.setActionCommand("comboBoxChanged");
 		jColumn.setModel(new ListComboBoxModel<>(allColumns));
 		if (allColumns.contains(selectedItem)) {
 			jColumn.setSelectedItem(selectedItem);
+			jColumn.setActionCommand(FilterPanelAction.FILTER.name()); //After: Do not refilter
 		} else if (!allColumns.isEmpty()) {
-			jColumn.setActionCommand(FilterPanelAction.FILTER.name());
+			jColumn.setActionCommand(FilterPanelAction.FILTER.name()); //Before: refilter
 			jColumn.setSelectedIndex(0);
-		} else {
-			jColumn.setActionCommand(FilterPanelAction.FILTER.name());
 		}
-
 	}
 
 	boolean isAnd() {
@@ -601,6 +600,7 @@ private Color getGroupColor() {
 	}
 
 	private void groupChanged() {
+		System.out.println("groupChanged");
 		refilter();
 		if (!loading) {
 			if (gui.fade(FilterPanel.this)) {
@@ -639,6 +639,7 @@ public void keyTyped(final KeyEvent e) { }
 		@Override
 		public void keyPressed(final KeyEvent e) {
 			if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+				System.out.println("keyPressed");
 				refilter();
 			}
 		}
@@ -672,6 +673,7 @@ public void actionPerformed(final ActionEvent e) {
 
 		@Override
 		public void dateChanged(DateChangeEvent e) {
+			System.out.println("dateChanged");
 			refilter();
 		}