From 8e7229b9b7ec9d68de03442e25fa02ee810aba61 Mon Sep 17 00:00:00 2001 From: "jy.exe.lee" Date: Thu, 12 Jul 2012 12:36:51 +0900 Subject: [PATCH] [Title] DAWindow position set [Type] bug fix [Module] DynamicAnalyzer [Priority]major [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- .../tizen/dynamicanalyzer/ui/views/CoolbarArea.java | 12 +++++------- .../tizen/dynamicanalyzer/ui/widgets/AboutDialog.java | 1 + .../ui/widgets/ConfigurationDialog.java | 1 + .../tizen/dynamicanalyzer/ui/widgets/DAWindow.java | 19 +++++++++++++++++-- .../dynamicanalyzer/ui/widgets/LicenseDialog.java | 1 + .../dynamicanalyzer/ui/widgets/OpenTraceDialog.java | 9 +++++---- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java index af11d8c..101cda5 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/views/CoolbarArea.java @@ -44,8 +44,6 @@ import org.tizen.dynamicanalyzer.model.AppDesktopInfo; import org.tizen.dynamicanalyzer.model.Project; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; import org.tizen.dynamicanalyzer.services.RecordStateSourceProvider; -import org.tizen.dynamicanalyzer.theme.DAThemeBlack; -import org.tizen.dynamicanalyzer.theme.DAThemeWhite; import org.tizen.dynamicanalyzer.ui.renderers.ComboButtonRenderer; import org.tizen.dynamicanalyzer.ui.renderers.TitleComboPopupRenderer; import org.tizen.dynamicanalyzer.ui.renderers.TitleComboRenderer; @@ -887,11 +885,11 @@ public class CoolbarArea { toggle.isToggled()); // theme test - if (toggle.isToggled()) { - AnalyzerManager.setTheme(DAThemeBlack.getInstance()); - } else { - AnalyzerManager.setTheme(DAThemeWhite.getInstance()); - } +// if (toggle.isToggled()) { +// AnalyzerManager.setTheme(DAThemeBlack.getInstance()); +// } else { +// AnalyzerManager.setTheme(DAThemeWhite.getInstance()); +// } } }); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/AboutDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/AboutDialog.java index a71775b..5989713 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/AboutDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/AboutDialog.java @@ -59,6 +59,7 @@ public class AboutDialog { shell.setLayout(shellLayout); shell.setText(AnalyzerLabels.ABOUT); shell.setMoveable(true); + shell.setCenter(); Composite base = new Composite(shell.getShell(), SWT.NONE); base.setLayout(new FormLayout()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ConfigurationDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ConfigurationDialog.java index 92aab2f..5d9cd2a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ConfigurationDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/ConfigurationDialog.java @@ -176,6 +176,7 @@ public class ConfigurationDialog{ window.setLayout(windowLayout); window.setText(AnalyzerLabels.CONFIGURATION); window.setMoveable(true); + window.setCenter(); Composite base = new Composite(window.getShell(), SWT.NONE); base.setLayout(new FormLayout()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java index 0764443..4139e58 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/DAWindow.java @@ -136,8 +136,6 @@ public class DAWindow { public DAWindow(Shell parent, int style) { shell = new Shell(parent, style | SWT.NO_TRIM | SWT.NO_BACKGROUND | SWT.CENTER); -// shell = new Shell(parent, style | SWT.NO_BACKGROUND | SWT.CENTER | SWT.TITLE); -// shell.setText("test"); closeButton = new DACustomButton(shell, closeImage, closePushImage, closeHoverImage, null); closeButton.setToolTipText(AnalyzerLabels.CLOSE); @@ -161,6 +159,7 @@ public class DAWindow { shell.addListener(SWT.MouseUp, trimListener); shell.addListener(SWT.MouseMove, trimListener); shell.addListener(SWT.Paint, trimListener); + } public void dispose() { @@ -227,4 +226,20 @@ public class DAWindow { public void setMoveable(boolean bMove) { this.bMove = bMove; } + + public void setCenter() + { + Shell parent = shell.getParent().getShell(); + + Rectangle pRect = parent.getBounds(); + Rectangle pChild = shell.getBounds(); + + int deltaX = pRect.width - pChild.width; + int deltaY = pRect.height - pChild.height; + + int childX = pRect.x + deltaX / 2; + int childY = pRect.y + deltaY / 2; + + shell.setLocation(childX, childY); + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/LicenseDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/LicenseDialog.java index 3e059f1..f3aeb14 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/LicenseDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/LicenseDialog.java @@ -87,6 +87,7 @@ public class LicenseDialog extends Window { shell.setLayout(shellLayout); shell.setText(AnalyzerLabels.LICENSE); shell.setMoveable(true); + shell.setCenter(); Composite base = new Composite(shell.getShell(), SWT.NONE); base.setLayout(new FormLayout()); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java index 7be6549..714d3ea 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/OpenTraceDialog.java @@ -11,6 +11,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; @@ -80,8 +81,7 @@ public class OpenTraceDialog extends Window { } }; - private DACustomButtonClickEventListener cancelButtonListener = new DACustomButtonClickEventListener( - ) { + private DACustomButtonClickEventListener cancelButtonListener = new DACustomButtonClickEventListener() { @Override public void handleClickEvent(DACustomButton button) { @@ -97,6 +97,7 @@ public class OpenTraceDialog extends Window { shell.setLayout(shellLayout); shell.setText(AnalyzerLabels.OPEN_TRACE); shell.setMoveable(false); + shell.setCenter(); Composite base = new Composite(shell.getShell(), SWT.NONE); base.setLayout(new FormLayout()); @@ -252,8 +253,8 @@ public class OpenTraceDialog extends Window { okData.height = 34; okButton.setLayoutData(okData); - cancelButton = new DACustomButton(buttonComp, buttonImage, buttonPushImage, - buttonHoverImage, null); + cancelButton = new DACustomButton(buttonComp, buttonImage, + buttonPushImage, buttonHoverImage, null); cancelButton.addClickListener(cancelButtonListener); cancelButton.setText("Close"); //$NON-NLS-1$ cancelButton.setFont(FontResources.DIALOG_BUTTON_FONT); -- 2.7.4