From 770f22763740c2e3d5bf4fa11019b9d685ca5564 Mon Sep 17 00:00:00 2001 From: gered Date: Sat, 16 Jan 2016 12:35:28 -0500 Subject: [PATCH] toggle menu resize options on/off depending on window autosize setting --- src/main/java/org/fenix/llanfair/Llanfair.java | 1 + src/main/java/org/fenix/llanfair/MenuItem.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/fenix/llanfair/Llanfair.java b/src/main/java/org/fenix/llanfair/Llanfair.java index fc8e071..7177ab9 100644 --- a/src/main/java/org/fenix/llanfair/Llanfair.java +++ b/src/main/java/org/fenix/llanfair/Llanfair.java @@ -355,6 +355,7 @@ public class Llanfair extends BorderlessFrame implements TableModelListener, || Settings.windowWidth.equals(property) || Run.NAME_PROPERTY.equals(property)) { setResizable(Settings.windowAutoSize.get()); + MenuItem.enableResizeOptions(Settings.windowAutoSize.get()); forceResize(); } } diff --git a/src/main/java/org/fenix/llanfair/MenuItem.java b/src/main/java/org/fenix/llanfair/MenuItem.java index c9076c6..eb9fb5e 100644 --- a/src/main/java/org/fenix/llanfair/MenuItem.java +++ b/src/main/java/org/fenix/llanfair/MenuItem.java @@ -32,8 +32,8 @@ enum MenuItem implements ActionListener { RESET( true, State.ONGOING, State.STOPPED, State.PAUSED ), LOCK( false, State.NULL, State.READY, State.STOPPED, State.ONGOING ), UNLOCK( false, State.NULL, State.READY, State.STOPPED, State.ONGOING ), - //RESIZE_DEFAULT( false, State.NULL, State.READY ), - //RESIZE_PREFERRED( true, State.NULL, State.READY ), + RESIZE_DEFAULT( false, State.NULL, State.READY ), + RESIZE_PREFERRED( true, State.NULL, State.READY ), SETTINGS( true, State.NULL, State.READY, State.STOPPED ), ABOUT( true, State.NULL, State.READY, State.STOPPED, State.ONGOING ), EXIT( false, State.NULL, State.READY, State.STOPPED, State.ONGOING ); @@ -225,4 +225,11 @@ enum MenuItem implements ActionListener { } } + public static void enableResizeOptions(boolean enable) { + for (MenuItem item : values()) { + if (item == RESIZE_DEFAULT || item == RESIZE_PREFERRED) + item.menuItem.setEnabled(enable); + } + } + }