Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Sternberg2011-02-05 17:10:17 +0000
committerRalf Sternberg2011-02-05 17:10:17 +0000
commit6930c16e1fefa3f75e95d5b66ea237bf6fa638de (patch)
treedf9834c551f5b540e34efdadddbd1d98ec1376cd /bundles
parentf174b5a3b7b3e2f38aa069843ca09d810e4fd66d (diff)
downloadorg.eclipse.rap-6930c16e1fefa3f75e95d5b66ea237bf6fa638de.tar.gz
org.eclipse.rap-6930c16e1fefa3f75e95d5b66ea237bf6fa638de.tar.xz
org.eclipse.rap-6930c16e1fefa3f75e95d5b66ea237bf6fa638de.zip
Renamed Variable
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandBar.java7
-rw-r--r--bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandItem.java4
2 files changed, 6 insertions, 5 deletions
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandBar.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandBar.java
index 8563a18eb4..dca01652db 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandBar.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandBar.java
@@ -383,15 +383,16 @@ public class ExpandBar extends Composite {
allItemsHeight = lastItem.y + lastItem.getBounds().height;
}
// Set items width based on scrollbar visibility
+ Rectangle bounds = getBounds();
int border = getBorderWidth();
- int v_scroll = getVScrollBarWidth();
+ int scrollBarWidth = getVScrollBarWidth();
for( int i = 0; i < itemCount; i++ ) {
ExpandItem item = getItem( i );
if( isVScrollbarVisible() ) {
- int width = getBounds().width - v_scroll - 2 * border - 2 * spacing;
+ int width = bounds.width - scrollBarWidth - 2 * border - 2 * spacing;
item.setBounds( 0, 0, width, item.height, false, true );
} else {
- int width = getBounds().width - 2 * border - 2 * spacing;
+ int width = bounds.width - 2 * border - 2 * spacing;
item.setBounds( 0, 0, width, item.height, false, true );
}
}
diff --git a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandItem.java b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandItem.java
index e99d142311..4b45452094 100644
--- a/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandItem.java
+++ b/bundles/org.eclipse.rap.rwt/src/org/eclipse/swt/widgets/ExpandItem.java
@@ -413,8 +413,8 @@ public class ExpandItem extends Item {
private void updateBounds() {
int parentWidth = parent.computeSize( SWT.DEFAULT, SWT.DEFAULT, false ).x;
- int v_scroll = parent.getVScrollBarWidth();
- int availableWidth = parentWidth - 2 * parent.spacing - v_scroll;
+ int scrollBarWidth = parent.getVScrollBarWidth();
+ int availableWidth = parentWidth - 2 * parent.spacing - scrollBarWidth;
width = Math.max( getPreferredWidth(), availableWidth );
setBounds( 0, 0, width, height, false, true );
}

Back to the top