Attachment 168626 Details for Bug 251093 – patch

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

[patch] patch

Bug_251093 (text/plain), 2.28 KB, created by Alex Boyko

on 2010-05-15 00:55:42 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Boyko

Created: 2010-05-15 00:55:42 EDT

Size: 2.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.draw2d
>Index: src/org/eclipse/draw2d/ScalableLayeredPane.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.gef/plugins/org.eclipse.draw2d/src/org/eclipse/draw2d/ScalableLayeredPane.java,v
>retrieving revision 1.14
>diff -u -r1.14 ScalableLayeredPane.java
>--- src/org/eclipse/draw2d/ScalableLayeredPane.java	14 Jun 2005 15:05:12 -0000	1.14
>+++ src/org/eclipse/draw2d/ScalableLayeredPane.java	15 May 2010 04:53:52 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2005 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -10,6 +10,8 @@
>  *******************************************************************************/
> package org.eclipse.draw2d;
> 
>+import org.eclipse.swt.SWT;
>+
> import org.eclipse.draw2d.geometry.Dimension;
> import org.eclipse.draw2d.geometry.Rectangle;
> import org.eclipse.draw2d.geometry.Translatable;
>@@ -42,7 +44,12 @@
>  * @see Figure#getPreferredSize(int, int)
>  */
> public Dimension getMinimumSize(int wHint, int hHint) {
>-	Dimension d = super.getMinimumSize((int) (wHint / getScale()), (int)(hHint / getScale()));
>+		Dimension d = super
>+				.getMinimumSize(
>+						wHint != SWT.DEFAULT ? (int) (wHint / getScale())
>+								: SWT.DEFAULT,
>+						hHint != SWT.DEFAULT ? (int) (hHint / getScale())
>+								: SWT.DEFAULT);
> 	int w = getInsets().getWidth();
> 	int h = getInsets().getHeight();
> 	return d.getExpanded(-w, -h)
>@@ -54,7 +61,11 @@
>  * @see Figure#getPreferredSize(int, int)
>  */
> public Dimension getPreferredSize(int wHint, int hHint) {
>-	Dimension d = super.getPreferredSize((int) (wHint / getScale()), (int)(hHint / getScale()));
>+	Dimension d = super.getPreferredSize(
>+			wHint != SWT.DEFAULT ? (int) (wHint / getScale())
>+					: SWT.DEFAULT,
>+			hHint != SWT.DEFAULT ? (int) (hHint / getScale())
>+					: SWT.DEFAULT);
> 	int w = getInsets().getWidth();
> 	int h = getInsets().getHeight();
> 	return d.getExpanded(-w, -h)

Actions: View | Diff

Attachments on bug 251093: 163137 | 163139 | 168625 | 168626