diff options
author | Wim Jongman | 2018-06-06 21:00:27 +0000 |
---|---|---|
committer | Wim Jongman | 2018-06-06 21:00:27 +0000 |
commit | b0171bc227aaecb42aca8aa068cd9a37ab20542b (patch) | |
tree | 13443aa0a653593a5c44a0966c30842f0be78c9b | |
parent | 1d4bad29e4cd5e576f1f6c6c7aaa6f0ff3ecf54a (diff) | |
download | eclipse.platform.ua-b0171bc227aaecb42aca8aa068cd9a37ab20542b.tar.gz eclipse.platform.ua-b0171bc227aaecb42aca8aa068cd9a37ab20542b.tar.xz eclipse.platform.ua-b0171bc227aaecb42aca8aa068cd9a37ab20542b.zip |
Bug 535585: [Tips] Initial dialog size
## CS1
Make size smaller
Change-Id: I43e80243a4af67e968e02eff7c3e7d2b0194747b
Signed-off-by: Wim Jongman <wim.jongman@remainsoftware.com>
-rw-r--r-- | org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java | 26 | ||||
-rw-r--r-- | org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java | 12 |
2 files changed, 2 insertions, 36 deletions
diff --git a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java index 1067e4d5d..be908321e 100644 --- a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java +++ b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipComposite.java @@ -28,7 +28,6 @@ import org.eclipse.swt.browser.Browser; import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; @@ -100,10 +99,8 @@ public class TipComposite extends Composite implements ProviderSelectionListener fContentStack = new StackLayout(); fContentComposite.setLayout(fContentStack); GridData gd_gridComposite = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1); - gd_gridComposite.widthHint = 900; - gd_gridComposite.heightHint = 600; - // gd_gridComposite.minimumWidth = -1; - // gd_gridComposite.minimumHeight = -1; + gd_gridComposite.widthHint = 600; + gd_gridComposite.heightHint = 400; fContentComposite.setLayoutData(gd_gridComposite); fBrowserComposite = new Composite(fContentComposite, SWT.NONE); @@ -473,7 +470,6 @@ public class TipComposite extends Composite implements ProviderSelectionListener fSingleActionButton.setImage(getActionImage(action.getTipImage())); fSingleActionButton.setText(action.getText()); fSingleActionButton.setToolTipText(action.getTooltip()); - blinkActionComposite(fSingleActionComposite); } else { TipAction action = tip.getActions().get(0); fActionStack.topControl = fMultiActionComposite; @@ -481,7 +477,6 @@ public class TipComposite extends Composite implements ProviderSelectionListener fMultiActionButton.setText(action.getText()); fMultiActionButton.setToolTipText(action.getTooltip()); loadActionMenu(tip); - blinkActionComposite(fMultiActionComposite); } fEmptyActionComposite.getParent().requestLayout(); fNavigationBar.requestLayout(); @@ -506,23 +501,6 @@ public class TipComposite extends Composite implements ProviderSelectionListener }); } - private void blinkActionComposite(Composite composite) { - Color bg = composite.getParent().getBackground(); - Color red = getDisplay().getSystemColor(SWT.COLOR_RED); - boolean flip = false; - for (int i = 1; i < 6; i++) { - boolean flop = flip; - if (!composite.isDisposed()) { - getDisplay().timerExec(i * 200, () -> { - if (!composite.isDisposed()) { - composite.getParent().setBackground(flop ? bg : red); - } - }); - } - flip = !flip; - } - } - private Image getActionImage(TipImage tipImage) { if (tipImage == null) { return null; diff --git a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java index 1e64ae7d0..82aa3471c 100644 --- a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java +++ b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/TipDialog.java @@ -65,17 +65,6 @@ public class TipDialog extends Dialog { return area; } -// private Point getLocation() { -// Shell parentShell = getParentShell(); -// if (parentShell == null) { -// return null; -// } -// int absx = parentShell.getSize().x / 2 - getShell().getSize().x / 2; -// int absy = parentShell.getSize().y / 2 - getShell().getSize().y / 2; -// absy = absy > 20 ? 20 : absy; -// return new Point(parentShell.getLocation().x + absx, parentShell.getLocation().y + absy); -// } - @Override protected void createButtonsForButtonBar(Composite pParent) { } @@ -83,7 +72,6 @@ public class TipDialog extends Dialog { @Override protected Control createButtonBar(Composite pParent) { Control bar = super.createButtonBar(pParent); - // fixLayout((Composite) bar); bar.setLayoutData(GridDataFactory.swtDefaults().hint(1, 1).create()); return bar; } |