-
Notifications
You must be signed in to change notification settings - Fork 110
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This reverts commit 64e43eb, reversing changes made to 6b38790. The reason to revert merge changes is to let the workspace run correctly.
- Loading branch information
Showing
11 changed files
with
183 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
...pse.ant.ui/Ant Tools Support/org/eclipse/ant/internal/ui/preferences/TabFolderLayout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2000, 2005 IBM Corporation and others. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * IBM Corporation - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.ant.internal.ui.preferences; | ||
|
|
||
| import org.eclipse.swt.SWT; | ||
| import org.eclipse.swt.graphics.Point; | ||
| import org.eclipse.swt.graphics.Rectangle; | ||
| import org.eclipse.swt.widgets.Composite; | ||
| import org.eclipse.swt.widgets.Control; | ||
| import org.eclipse.swt.widgets.Layout; | ||
|
|
||
| public class TabFolderLayout extends Layout { | ||
|
|
||
| @Override | ||
| protected Point computeSize(Composite composite, int wHint, int hHint, boolean flushCache) { | ||
| if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) | ||
| return new Point(wHint, hHint); | ||
|
|
||
| Control[] children = composite.getChildren(); | ||
| int count = children.length; | ||
| int maxWidth = 0, maxHeight = 0; | ||
| for (int i = 0; i < count; i++) { | ||
| Control child = children[i]; | ||
| Point pt = child.computeSize(SWT.DEFAULT, SWT.DEFAULT, flushCache); | ||
| maxWidth = Math.max(maxWidth, pt.x); | ||
| maxHeight = Math.max(maxHeight, pt.y); | ||
| } | ||
|
|
||
| if (wHint != SWT.DEFAULT) | ||
| maxWidth = wHint; | ||
| if (hHint != SWT.DEFAULT) | ||
| maxHeight = hHint; | ||
|
|
||
| return new Point(maxWidth, maxHeight); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected void layout(Composite composite, boolean flushCache) { | ||
| Rectangle rect = composite.getClientArea(); | ||
|
|
||
| for (Control element : composite.getChildren()) { | ||
| element.setBounds(rect); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
team/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TabFolderLayout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2000, 2011 IBM Corporation and others. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * IBM Corporation - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.compare.internal; | ||
|
|
||
| import org.eclipse.swt.SWT; | ||
| import org.eclipse.swt.graphics.Point; | ||
| import org.eclipse.swt.graphics.Rectangle; | ||
| import org.eclipse.swt.widgets.Composite; | ||
| import org.eclipse.swt.widgets.Control; | ||
| import org.eclipse.swt.widgets.Layout; | ||
|
|
||
| public class TabFolderLayout extends Layout { | ||
|
|
||
| @Override | ||
| protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) { | ||
| if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) | ||
| return new Point(wHint, hHint); | ||
|
|
||
| Control [] children = composite.getChildren (); | ||
| int count = children.length; | ||
| int maxWidth = 0, maxHeight = 0; | ||
| for (int i=0; i<count; i++) { | ||
| Control child = children [i]; | ||
| Point pt = child.computeSize (SWT.DEFAULT, SWT.DEFAULT, flushCache); | ||
| maxWidth = Math.max (maxWidth, pt.x); | ||
| maxHeight = Math.max (maxHeight, pt.y); | ||
| } | ||
|
|
||
| if (wHint != SWT.DEFAULT) | ||
| maxWidth= wHint; | ||
| if (hHint != SWT.DEFAULT) | ||
| maxHeight= hHint; | ||
|
|
||
| return new Point(maxWidth, maxHeight); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected void layout (Composite composite, boolean flushCache) { | ||
| Rectangle rect= composite.getClientArea(); | ||
|
|
||
| Control[] children = composite.getChildren(); | ||
| for (Control c : children) { | ||
| c.setBounds(rect); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 59 additions & 0 deletions
59
ua/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/preferences/TabFolderLayout.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /******************************************************************************* | ||
| * Copyright (c) 2008, 2016 IBM Corporation and others. | ||
| * | ||
| * This program and the accompanying materials | ||
| * are made available under the terms of the Eclipse Public License 2.0 | ||
| * which accompanies this distribution, and is available at | ||
| * https://www.eclipse.org/legal/epl-2.0/ | ||
| * | ||
| * SPDX-License-Identifier: EPL-2.0 | ||
| * | ||
| * Contributors: | ||
| * IBM Corporation - initial API and implementation | ||
| *******************************************************************************/ | ||
| package org.eclipse.help.ui.internal.preferences; | ||
|
|
||
|
|
||
| import org.eclipse.swt.SWT; | ||
| import org.eclipse.swt.graphics.Point; | ||
| import org.eclipse.swt.graphics.Rectangle; | ||
| import org.eclipse.swt.widgets.Composite; | ||
| import org.eclipse.swt.widgets.Control; | ||
| import org.eclipse.swt.widgets.Layout; | ||
|
|
||
| public class TabFolderLayout extends Layout { | ||
|
|
||
| @Override | ||
| protected Point computeSize (Composite composite, int wHint, int hHint, boolean flushCache) { | ||
| if (wHint != SWT.DEFAULT && hHint != SWT.DEFAULT) | ||
| return new Point(wHint, hHint); | ||
|
|
||
| Control [] children = composite.getChildren (); | ||
| int count = children.length; | ||
| int maxWidth = 0, maxHeight = 0; | ||
| for (int i=0; i<count; i++) { | ||
| Control child = children [i]; | ||
| Point pt = child.computeSize (SWT.DEFAULT, SWT.DEFAULT, flushCache); | ||
| maxWidth = Math.max (maxWidth, pt.x); | ||
| maxHeight = Math.max (maxHeight, pt.y); | ||
| } | ||
|
|
||
| if (wHint != SWT.DEFAULT) | ||
| maxWidth= wHint; | ||
| if (hHint != SWT.DEFAULT) | ||
| maxHeight= hHint; | ||
|
|
||
| return new Point(maxWidth, maxHeight); | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| protected void layout (Composite composite, boolean flushCache) { | ||
| Rectangle rect= composite.getClientArea(); | ||
|
|
||
| Control[] children = composite.getChildren(); | ||
| for (int i = 0; i < children.length; i++) { | ||
| children[i].setBounds(rect); | ||
| } | ||
| } | ||
| } |