Minor StatusMessageWidget changes

GoClipse · May 26, 2016 · d6cad5e · d6cad5e
1 parent 1069c76
commit d6cad5e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/build/CommandInvocationEditor.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/build/CommandInvocationEditor.java
@@ -61,7 +61,7 @@ public CommandInvocationEditor(CommonGetter<CommandInvocation> getDefaultCommand
 		commandInvocation.addChangeListener(this::updateWidgetFromInput);
 	}
 
-	public TextFieldWidget getButtonTextField() {
+	public TextFieldWidget getCommandArgumentsWidget() {
 		return commandArgumentsField;
 	}
 
@@ -152,7 +152,7 @@ protected String newValueFromCommandVariablesDialog() throws OperationCancellati
 	}
 
 	protected void handleEditEnvironmentVars() {
-		Shell shell = getButtonTextField().getFieldControl().getShell();
+		Shell shell = getCommandArgumentsWidget().getFieldControl().getShell();
 
 		CommandInvocation cmd = getFieldValue();
 		EnvironmentSettings envSettings = new EnvironmentSettings(

diff --git a/plugin_ide.ui/src-lang/melnorme/util/swt/components/AbstractDisableableWidget.java b/plugin_ide.ui/src-lang/melnorme/util/swt/components/AbstractDisableableWidget.java
@@ -74,7 +74,7 @@ protected void doUpdateWidgetFromInput() {
 
 	/* -----------------  ----------------- */
 
-	protected void setControlEnabled(Control control, boolean enabled) {
+	protected static void setControlEnabled(Control control, boolean enabled) {
 		SWTUtil.setEnabledIfOk(control, enabled);
 	}
 

diff --git a/plugin_ide.ui/src-lang/melnorme/util/swt/components/misc/StatusMessageWidget.java b/plugin_ide.ui/src-lang/melnorme/util/swt/components/misc/StatusMessageWidget.java
@@ -25,12 +25,12 @@
 
 import melnorme.util.swt.SWTFactoryUtil;
 import melnorme.util.swt.SWTUtil;
-import melnorme.util.swt.components.AbstractWidget;
+import melnorme.util.swt.components.AbstractDisableableWidget;
 import melnorme.utilbox.status.IStatusMessage;
 import melnorme.utilbox.status.IStatusMessage.StatusMessage;
 import melnorme.utilbox.status.Severity;
 
-public class StatusMessageWidget extends AbstractWidget {
+public class StatusMessageWidget extends AbstractDisableableWidget {
 
 	protected Composite topControl;
 
@@ -45,7 +45,7 @@ public int getPreferredLayoutColumns() {
 
 	@Override
 	public void createComponentInlined(Composite parent) {
-		this.topControl = parent;
+		assertFail(); // not supported yet
 	}
 
 	@Override
@@ -56,8 +56,15 @@ protected void createContents(Composite topControl) {
 			null, 
 			GridDataFactory.swtDefaults().create());
 
+		// Note: make sure we provide a minimum width hint, so label text doesn't take up one long line.
 		hintText = SWTFactoryUtil.createLink(topControl, SWT.LEFT, "", 
-			GridDataFactory.fillDefaults().grab(true, false).create());
+			GridDataFactory.fillDefaults().hint(100, -1).grab(true, false).create());
+	}
+
+	@Override
+	protected void doSetEnabled(boolean enabled) {
+		setControlEnabled(icon, enabled);
+		setControlEnabled(hintText, enabled);
 	}
 
 	@Override