Attachment 25354 Details for Bug 70049 – improved bugfix (call to layout was missing), patch for o.e.ui.workbench

[patch] improved bugfix (call to layout was missing), patch for o.e.ui.workbench

patch.txt (text/plain), 4.12 KB, created by Boris Bokowski

on 2005-07-27 10:59:08 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Boris Bokowski

Created: 2005-07-27 10:59:08 EDT

Size: 4.12 KB

patch

obsolete

>Index: Eclipse UI/org/eclipse/ui/internal/PerspectiveSwitcher.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectiveSwitcher.java,v
>retrieving revision 1.34
>diff -u -r1.34 PerspectiveSwitcher.java
>--- Eclipse UI/org/eclipse/ui/internal/PerspectiveSwitcher.java	8 Jun 2005 21:36:47 -0000	1.34
>+++ Eclipse UI/org/eclipse/ui/internal/PerspectiveSwitcher.java	27 Jul 2005 14:55:10 -0000
>@@ -260,6 +260,23 @@
> 	}
> 
> 	/**
>+	 * @return the current location of the perspective bar in terms of
>+	 * the string constants defined in <code>IWorkbenchPreferenceConstants</code>.
>+	 */
>+	public String getPerspectiveBarLocation() {
>+		switch (currentLocation) {
>+		case TOP_RIGHT:
>+			return IWorkbenchPreferenceConstants.TOP_RIGHT;
>+		case TOP_LEFT:
>+			return IWorkbenchPreferenceConstants.TOP_LEFT;
>+		case LEFT:
>+			return IWorkbenchPreferenceConstants.LEFT;
>+		default:
>+			return null;
>+		}
>+	}
>+	
>+	/**
>      * Locate the perspective bar according to the provided location
> 	 * @param preference the location to put the perspective bar at
> 	 */
>Index: Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java,v
>retrieving revision 1.292
>diff -u -r1.292 WorkbenchWindow.java
>--- Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java	8 Jul 2005 21:19:20 -0000	1.292
>+++ Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java	27 Jul 2005 14:55:12 -0000
>@@ -2553,6 +2553,12 @@
>             actionPresentation.setActionSets(currentPage.getActionSets());
>         }
>         updateActionBars();
>+        
>+        // hide/show the cool bar if necessary
>+    	if(setCoolBarVisible(getCoolBarManager().getItems().length > 0)) {
>+    		// we need to layout because the visibility has changed
>+    		getShell().layout();
>+    	}
> 
>         // hide the launch menu if it is empty
>         String path = IWorkbenchActionConstants.M_WINDOW
>@@ -2830,14 +2836,17 @@
>      * @param visible whether the cool bar should be shown.  This is only 
>      * applicable if the window configurer also wishes either the cool bar to be
>      * visible.
>+     * @return <code>true</code> if the visibility of the cool bar has changed 
>      * @since 3.0 
>      */
>-    public void setCoolBarVisible(boolean visible) {
>+    public boolean setCoolBarVisible(boolean visible) {
>         boolean oldValue = coolBarVisible;
>         coolBarVisible = visible;
>         if (oldValue != coolBarVisible) {
>             updateLayoutDataForContents();
>+            return true;
>         }
>+        return false;
>     }
> 
>     /** 
>@@ -2911,15 +2920,20 @@
> 
>         // @issue this is not ideal; coolbar and perspective shortcuts should be
>         //   separately configurable
>-        if ((getCoolBarVisible() && getWindowConfigurer().getShowCoolBar())
>-                || (getPerspectiveBarVisible() && getWindowConfigurer()
>-                        .getShowPerspectiveBar())) {
>-            defaultLayout.addTrim(topBar, SWT.TOP, null);
>-            topBar.setVisible(true);
>-        } else {
>-            defaultLayout.removeTrim(topBar);
>-            topBar.setVisible(false);
>-        }
>+        boolean showCoolBar = getCoolBarVisible()
>+				&& getWindowConfigurer().getShowCoolBar();
>+		boolean showPerspectiveBar = getPerspectiveBarVisible()
>+				&& getWindowConfigurer().getShowPerspectiveBar();
>+		String perspectiveBarLocation = perspectiveSwitcher==null ? null : perspectiveSwitcher.getPerspectiveBarLocation();
>+		if (showCoolBar
>+				|| (showPerspectiveBar && !IWorkbenchPreferenceConstants.LEFT
>+						.equals(perspectiveBarLocation))) {
>+			defaultLayout.addTrim(topBar, SWT.TOP, null);
>+			topBar.setVisible(true);
>+		} else {
>+			defaultLayout.removeTrim(topBar);
>+			topBar.setVisible(false);
>+		}
> 
>         if (getStatusLineVisible() && getWindowConfigurer().getShowStatusLine()) {
>             defaultLayout.addTrim(getStatusLineManager().getControl(),

Actions: View | Diff

Attachments on bug 70049: 13258 | 13261 | 13837 | 13838 | 25146 | 25328 | 25329 | 25354 | 45225