diff options
| author | Raphael <raphael@google.com> | 2011-10-12 15:45:44 -0700 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2011-10-12 15:45:44 -0700 |
| commit | ae3597ad203b835eeded92fc01466456cfeccf39 (patch) | |
| tree | 6a11451696a24d3c7229c7c0b14520a320aecea2 | |
| parent | 1dde75413aa2fe38e4f495cc40e54b0f0cdab4bf (diff) | |
| download | sdk-ae3597ad203b835eeded92fc01466456cfeccf39.zip sdk-ae3597ad203b835eeded92fc01466456cfeccf39.tar.gz sdk-ae3597ad203b835eeded92fc01466456cfeccf39.tar.bz2 | |
SDK Manager: Fix disabled quit menu on Mac.
This was due to the shell being marked as app_modal.
SDK Bug: 20616
Change-Id: I1352fe4573f79890f2633be6140c1c63b79150b6
2 files changed, 6 insertions, 18 deletions
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java index 0e5c3d0..a26e7ef 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/AvdManagerWindowImpl1.java @@ -28,9 +28,9 @@ import com.android.sdkuilib.internal.repository.UpdaterPage; import com.android.sdkuilib.internal.repository.UpdaterPage.Purpose;
import com.android.sdkuilib.internal.repository.icons.ImageFactory;
import com.android.sdkuilib.internal.repository.sdkman1.AvdManagerPage;
+import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;
import com.android.sdkuilib.repository.ISdkChangeListener;
import com.android.sdkuilib.repository.SdkUpdaterWindow;
-import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;
import com.android.sdkuilib.ui.GridDataBuilder;
import com.android.sdkuilib.ui.GridLayoutBuilder;
import com.android.sdkuilib.ui.SwtBaseDialog;
@@ -154,15 +154,9 @@ public class AvdManagerWindowImpl1 { // or a dialog trim when invoked from somewhere else.
int style = SWT.SHELL_TRIM;
if (mContext != AvdInvocationContext.STANDALONE) {
- style = SWT.DIALOG_TRIM;
- }
- if (SdkConstants.currentPlatform() != SdkConstants.PLATFORM_LINUX ||
- mContext != AvdInvocationContext.STANDALONE) {
- // Ideally we want the window to be app-modal, but this prevents the
- // log window from working properly on Linux so don't use the app modal
- // flag if this is linux and the app is standalone.
- style += SWT.APPLICATION_MODAL;
+ style = SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL;
}
+
mShell = new Shell(mParentShell, style);
mShell.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
diff --git a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java index 9385793..d7d8dc6 100755 --- a/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java +++ b/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/sdkman2/SdkUpdaterWindowImpl2.java @@ -34,8 +34,8 @@ import com.android.sdkuilib.internal.tasks.ProgressView; import com.android.sdkuilib.internal.tasks.ProgressViewFactory;
import com.android.sdkuilib.internal.widgets.ImgDisabledButton;
import com.android.sdkuilib.internal.widgets.ToggleButton;
-import com.android.sdkuilib.repository.ISdkChangeListener;
import com.android.sdkuilib.repository.AvdManagerWindow.AvdInvocationContext;
+import com.android.sdkuilib.repository.ISdkChangeListener;
import com.android.sdkuilib.repository.SdkUpdaterWindow.SdkInvocationContext;
import com.android.sdkuilib.ui.GridDataBuilder;
import com.android.sdkuilib.ui.GridLayoutBuilder;
@@ -169,15 +169,9 @@ public class SdkUpdaterWindowImpl2 implements ISdkUpdaterWindow { // or a dialog trim when invoked from somewhere else.
int style = SWT.SHELL_TRIM;
if (mContext != SdkInvocationContext.STANDALONE) {
- style = SWT.DIALOG_TRIM;
- }
- if (SdkConstants.currentPlatform() != SdkConstants.PLATFORM_LINUX ||
- mContext != SdkInvocationContext.STANDALONE) {
- // Ideally we want the window to be app-modal, but this prevents the
- // log window from working properly on Linux so don't use the app modal
- // flag if this is linux and the app is standalone.
- style += SWT.APPLICATION_MODAL;
+ style = SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL;
}
+
mShell = new Shell(mParentShell, style);
mShell.addDisposeListener(new DisposeListener() {
public void widgetDisposed(DisposeEvent e) {
|