Merge branch 'master' into abstractcontributionitem-disabledlazy

Author: HeikoKlare

bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.png

@@ -22,6 +22,7 @@
 
 import org.eclipse.core.runtime.Assert;
 import org.eclipse.core.runtime.ListenerList;
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
@@ -287,7 +288,13 @@ protected void layout(Composite parent, boolean changed) {
 			Point labelDefault = this.textLabelCache.computeSize(SWT.DEFAULT, SWT.DEFAULT);
 
 			int tcWidthBeforeSplit = Math.min(width, tcDefault.x);
-			int labelWidthBeforeSplit = Math.min(width, labelDefault.x);
+
+			int additionalLabelWidthPadding = 0;
+			if (OS.isWindows()) {
+				/* compensate rounding issue in windows */
+				additionalLabelWidthPadding = 1;
+			}
+			int labelWidthBeforeSplit = Math.min(width, labelDefault.x + additionalLabelWidthPadding);
 
 			int tcWidthAfterSplit = tcWidthBeforeSplit;
 			int labelWidthAfterSplit = labelWidthBeforeSplit;

bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/view_menu.svg

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.ui.themes;singleton:=true
-Bundle-Version: 1.2.2700.qualifier
+Bundle-Version: 1.2.2800.qualifier
 Bundle-Vendor: %Plugin.providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.e4.ui.css.swt.theme

bundles/org.eclipse.e4.ui.workbench.renderers.swt/icons/full/elcl16/[email protected]

@@ -17,4 +17,4 @@ bin.includes = META-INF/,\
                about.html,\
                plugin.properties,\
                css/
-src.includes = about.html
+ pom.model.property.tycho.source.skip = true

bundles/org.eclipse.ui.forms/src/org/eclipse/ui/forms/widgets/ExpandableComposite.java

@@ -13,6 +13,7 @@
  *******************************************************************************/
 package org.eclipse.ui.internal.misc;
 
+import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.ImageData;
 import org.eclipse.swt.program.Program;
@@ -23,7 +24,7 @@
  * The external program image descriptor is the descriptor used to handle images
  * that are from a Program.
  */
-public class ExternalProgramImageDescriptor extends ImageDescriptor {
+public class ExternalProgramImageDescriptor extends ImageDescriptor implements IAdaptable {
 
 	private Program program;
 
@@ -73,4 +74,12 @@ public int hashCode() {
 		}
 		return programName.hashCode();
 	}
+
+	@Override
+	public <T> T getAdapter(Class<T> adapter) {
+		if (adapter == Program.class) {
+			return adapter.cast(program);
+		}
+		return null;
+	}
 }