REOPENED - bug 280295: [mac] activate task button in task bar is too low and clipped

https://bugs.eclipse.org/bugs/show_bug.cgi?id=280295

2 files changed, 0 insertions, 23 deletions

diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java
index b89569e85..b3373a93e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/PlatformUtil.java
@@ -137,23 +137,6 @@ public class PlatformUtil {
 		return Platform.WS_GTK.equals(SWT.getPlatform()) && toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT, false).y == 0;
 	}
 
-	/**
-	 * If a Windows toolbar does not have a standard ToolItem but use only ControlContributions a dummy ToolItem needs
-	 * to be added to force the height to be > 22 pixels.
-	 */
-	public static boolean needsToolItemToForceToolBarHeight() {
-		return Platform.WS_WIN32.equals(SWT.getPlatform()) || needsCarbonToolBarFix();
-	}
-
-	/**
-	 * If a Carbon toolbar does not have a standard ToolItem but use only ControlContributions the control contribution
-	 * will only be about as half as tall the toolbar. The work-around is to make the toolbar twice as tall as the
-	 * contribution.
-	 */
-	public static boolean needsCarbonToolBarFix() {
-		return Platform.WS_CARBON.equals(SWT.getPlatform());
-	}
-
 	public static boolean spinnerHasNativeBorder() {
 		return isMac();
 	}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
index f0af7a803..1a3ec681e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java
@@ -340,9 +340,6 @@ public class TaskEditor extends SharedHeaderFormEditor {
 			// bottom align tool bar in title region
 			leftToolBarSize = leftToolBar.getSize();
 			int y = leftToolBar.getParent().getSize().y - leftToolBarSize.y - 2;
-			if (PlatformUtil.needsCarbonToolBarFix()) {
-				y += 5;
-			}
 			if (!hasLeftToolBar()) {
 				// hide tool bar to avoid overlaying busyLabel on windows
 				leftToolBarSize.x = 0;
@@ -739,9 +736,6 @@ public class TaskEditor extends SharedHeaderFormEditor {
 		}
 
 		final Point size = leftToolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
-		if (PlatformUtil.needsCarbonToolBarFix()) {
-			size.y = 22;
-		}
 		Point titleSize = titleLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, true);
 		size.x += titleSize.x + LEFT_TOOLBAR_HEADER_TOOLBAR_PADDING;
 		size.y = Math.max(titleSize.y, size.y);