Merge change I5b1f8bca into eclair-sdk
* changes: AVD Manager: Properly disable AVD > Start > ? under Windows
This commit is contained in:
@@ -34,6 +34,7 @@ import org.eclipse.swt.layout.GridData;
|
|||||||
import org.eclipse.swt.layout.GridLayout;
|
import org.eclipse.swt.layout.GridLayout;
|
||||||
import org.eclipse.swt.widgets.Button;
|
import org.eclipse.swt.widgets.Button;
|
||||||
import org.eclipse.swt.widgets.Composite;
|
import org.eclipse.swt.widgets.Composite;
|
||||||
|
import org.eclipse.swt.widgets.Control;
|
||||||
import org.eclipse.swt.widgets.Group;
|
import org.eclipse.swt.widgets.Group;
|
||||||
import org.eclipse.swt.widgets.Label;
|
import org.eclipse.swt.widgets.Label;
|
||||||
import org.eclipse.swt.widgets.Shell;
|
import org.eclipse.swt.widgets.Shell;
|
||||||
@@ -202,13 +203,13 @@ final class AvdStartDialog extends GridDialog {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
scaleGroup.setEnabled(defaultState);
|
enableGroup(scaleGroup, defaultState);
|
||||||
|
|
||||||
mScaleButton.addSelectionListener(new SelectionAdapter() {
|
mScaleButton.addSelectionListener(new SelectionAdapter() {
|
||||||
@Override
|
@Override
|
||||||
public void widgetSelected(SelectionEvent event) {
|
public void widgetSelected(SelectionEvent event) {
|
||||||
boolean enabled = mScaleButton.getSelection();
|
boolean enabled = mScaleButton.getSelection();
|
||||||
scaleGroup.setEnabled(enabled);
|
enableGroup(scaleGroup, enabled);
|
||||||
if (enabled) {
|
if (enabled) {
|
||||||
onScaleChange();
|
onScaleChange();
|
||||||
} else {
|
} else {
|
||||||
@@ -239,6 +240,14 @@ final class AvdStartDialog extends GridDialog {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** On Windows we need to manually enable/disable the children of a group */
|
||||||
|
private void enableGroup(final Group group, boolean enabled) {
|
||||||
|
group.setEnabled(enabled);
|
||||||
|
for (Control c : group.getChildren()) {
|
||||||
|
c.setEnabled(enabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void configureShell(Shell newShell) {
|
protected void configureShell(Shell newShell) {
|
||||||
super.configureShell(newShell);
|
super.configureShell(newShell);
|
||||||
|
|||||||
Reference in New Issue
Block a user