浏览代码

Hide rest panel in lock mode when no rest

Sam Jaffe 4 年之前
父节点
当前提交
fe04fd9d07
共有 1 个文件被更改,包括 6 次插入5 次删除
  1. 6 5
      src/main/lombok/org/leumasjaffe/recipe/view/RestPanel.java

+ 6 - 5
src/main/lombok/org/leumasjaffe/recipe/view/RestPanel.java

@@ -66,8 +66,8 @@ public class RestPanel extends JPanel {
 		add(panelUpTo, gbc_panelUpTo);
 
 		jcbLocation.addItemListener(e -> {
-			panelDuration.txtTime.setEditable(!isResting());
-			panelUpTo.txtTime.setEditable(!isResting());
+			panelDuration.txtTime.setEditable(isResting());
+			panelUpTo.txtTime.setEditable(isResting());
 			this.model.setWhere(Rest.Where.class.cast(e.getItem()));
 		});
 		durationController = ObservableController.from(panelDuration.txtTime,
@@ -94,9 +94,10 @@ public class RestPanel extends JPanel {
 	@Override
 	public void setEnabled(boolean enabled) {
 		super.setEnabled(enabled);
+		setVisible(enabled || isResting());
 		jcbLocation.setEnabled(enabled);
-		panelDuration.txtTime.setEditable(enabled && !isResting());
-		panelUpTo.txtTime.setEditable(enabled && !isResting());
+		panelDuration.txtTime.setEditable(enabled && isResting());
+		panelUpTo.txtTime.setEditable(enabled && isResting());
 	}
 	
 	@Override
@@ -106,7 +107,7 @@ public class RestPanel extends JPanel {
 	}
 
 	private boolean isResting() {
-		return jcbLocation.getSelectedItem().equals(Rest.Where.NONE);
+		return !jcbLocation.getSelectedItem().equals(Rest.Where.NONE);
 	}
 
 }