Attachment 134691 Details for Bug 102885 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

patch-102885.txt (text/plain), 1.60 KB, created by Boris Bokowski

on 2009-05-06 16:16:07 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Bokowski

Created: 2009-05-06 16:16:07 EDT

Size: 1.60 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java,v
>retrieving revision 1.409
>diff -u -r1.409 WorkbenchWindow.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java	28 Apr 2009 00:17:51 -0000	1.409
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java	6 May 2009 20:10:31 -0000
>@@ -1269,6 +1269,8 @@
> 		if (perspectiveSwitcher != null) {
> 			perspectiveSwitcher.setPerspectiveBarLocation(location);
> 		}
>+		updateLayoutDataForContents();
>+		getShell().layout();
> 	}
> 
> 	/**
>@@ -3697,9 +3699,15 @@
> 
> 		// @issue this is not ideal; coolbar and perspective shortcuts should be
> 		// separately configurable
>+		String perspectiveBarOnTheLeftString = PlatformUI.getPreferenceStore()
>+				.getString(IWorkbenchPreferenceConstants.DOCK_PERSPECTIVE_BAR);
>+		boolean perspectiveBarOnTheLeft = perspectiveBarOnTheLeftString != null
>+				&& perspectiveBarOnTheLeftString
>+						.equalsIgnoreCase(IWorkbenchPreferenceConstants.LEFT);
>+
> 		if ((getCoolBarVisible() && getWindowConfigurer().getShowCoolBar())
>-				|| (getPerspectiveBarVisible() && getWindowConfigurer()
>-						.getShowPerspectiveBar())) {
>+				|| (getPerspectiveBarVisible()
>+						&& getWindowConfigurer().getShowPerspectiveBar() && !perspectiveBarOnTheLeft)) {
> 			if (defaultLayout.getTrim(topBarTrim.getId()) == null) {
> 				defaultLayout.addTrim(SWT.TOP, topBarTrim);
> 			}

Actions: View | Diff

Attachments on bug 102885: 134691