Skip to content

Commit

Permalink
Images not aligned properly in Expand Bar
Browse files Browse the repository at this point in the history 
When adding image larger than the header size in expand bar, it was
drawn outside of the bar on the top. This was due to wrong calculation
and mixing of points and pixels
  • Loading branch information
@ShahzaibIbrahim
ShahzaibIbrahim committed Nov 1, 2024
1 parent 5dd0c28 commit 8aeba54
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 32 deletions.
66 changes: 35 additions & 31 deletions bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ExpandItem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,13 @@ private void drawChevron (long hDC, RECT rect) {

void drawItem (GC gc, long hTheme, RECT clipRect, boolean drawFocus) {
long hDC = gc.handle;
int headerHeight = parent.getBandHeight ();
int headerHeightinPixels = getHeaderHeightInPixels();
int zoom = getZoom();
int imageHeightInPixels = DPIUtil.scaleUp(imageHeight, zoom);
int imageWidthInPixels = DPIUtil.scaleUp(imageWidth, zoom);

RECT rect = new RECT ();
OS.SetRect (rect, x, y, x + width, y + headerHeight);
OS.SetRect (rect, x, y, x + width, y + headerHeightinPixels);
if (hTheme != 0) {
OS.DrawThemeBackground (hTheme, hDC, OS.EBP_NORMALGROUPHEAD, 0, rect, clipRect);
} else {
Expand All @@ -194,14 +198,10 @@ void drawItem (GC gc, long hTheme, RECT clipRect, boolean drawFocus) {
OS.SelectObject (hDC, oldBrush);
}
if (image != null) {
int zoom = getZoom();
rect.left += ExpandItem.TEXT_INSET;
if (imageHeight > headerHeight) {
gc.drawImage (image, DPIUtil.scaleDown(rect.left, zoom), DPIUtil.scaleDown(rect.top + headerHeight - imageHeight, zoom));
} else {
gc.drawImage (image, DPIUtil.scaleDown(rect.left, zoom), DPIUtil.scaleDown(rect.top + (headerHeight - imageHeight) / 2, zoom));
}
rect.left += imageWidth;
int yInPoints = DPIUtil.scaleDown(rect.top + ((headerHeightinPixels - imageHeightInPixels) / 2), zoom);
gc.drawImage (image, DPIUtil.scaleDown(rect.left, zoom), yInPoints);
rect.left += imageWidthInPixels;
}
if (text.length () > 0) {
rect.left += ExpandItem.TEXT_INSET;
Expand All @@ -213,8 +213,7 @@ void drawItem (GC gc, long hTheme, RECT clipRect, boolean drawFocus) {
} else {
buffer = (RLE + text).toCharArray ();
}
}
else {
} else {
buffer = text.toCharArray ();
}
if (hTheme != 0) {
Expand All @@ -227,7 +226,7 @@ void drawItem (GC gc, long hTheme, RECT clipRect, boolean drawFocus) {
}
int chevronSize = ExpandItem.CHEVRON_SIZE;
rect.left = rect.right - chevronSize;
rect.top = y + (headerHeight - chevronSize) / 2;
rect.top = y;
rect.bottom = rect.top + chevronSize;
if (hTheme != 0) {
int partID = expanded ? OS.EBP_NORMALGROUPCOLLAPSE : OS.EBP_NORMALGROUPEXPAND;
Expand All @@ -237,18 +236,18 @@ void drawItem (GC gc, long hTheme, RECT clipRect, boolean drawFocus) {
drawChevron (hDC, rect);
}
if (drawFocus) {
OS.SetRect (rect, x + 1, y + 1, x + width - 2, y + headerHeight - 2);
OS.SetRect (rect, x + 1, y + 1, x + width - 2, y + headerHeightinPixels - 2);
OS.DrawFocusRect (hDC, rect);
}
if (expanded) {
if (!parent.isAppThemed ()) {
long pen = OS.CreatePen (OS.PS_SOLID, 1, OS.GetSysColor (OS.COLOR_BTNFACE));
long oldPen = OS.SelectObject (hDC, pen);
int [] points = {
x, y + headerHeight,
x, y + headerHeight + height,
x + width - 1, y + headerHeight + height,
x + width - 1, y + headerHeight - 1};
x, y + headerHeightinPixels,
x, y + headerHeightinPixels + height,
x + width - 1, y + headerHeightinPixels + height,
x + width - 1, y + headerHeightinPixels - 1};
OS.Polyline (hDC, points, points.length / 2);
OS.SelectObject (hDC, oldPen);
OS.DeleteObject (pen);
Expand Down Expand Up @@ -310,7 +309,12 @@ public int getHeaderHeight () {
}

int getHeaderHeightInPixels () {
return Math.max (parent.getBandHeight (), imageHeight);
int headerHeightInPixels = parent.getBandHeight ();
int imageHeightInPixels = DPIUtil.scaleUp(imageHeight, getZoom());
if(imageHeightInPixels > headerHeightInPixels) {
headerHeightInPixels = imageHeightInPixels + headerHeightInPixels;
}
return headerHeightInPixels;
}

/**
Expand Down Expand Up @@ -372,17 +376,20 @@ boolean isHover (int x, int y) {

void redraw (boolean all) {
long parentHandle = parent.handle;
int headerHeight = parent.getBandHeight ();
int headerHeightInPixels = getHeaderHeightInPixels();
int zoom = getZoom();
int imageHeightInPixels = DPIUtil.scaleUp(imageHeight, zoom);
int imageWidthInPixels = DPIUtil.scaleUp(imageWidth, zoom);
RECT rect = new RECT ();
int left = all ? x : x + width - headerHeight;
OS.SetRect (rect, left, y, x + width, y + headerHeight);
int left = all ? x : x + width - headerHeightInPixels;
OS.SetRect (rect, left, y, x + width, y + headerHeightInPixels);
OS.InvalidateRect (parentHandle, rect, true);
if (imageHeight > headerHeight) {
OS.SetRect (rect, x + ExpandItem.TEXT_INSET, y + headerHeight - imageHeight, x + ExpandItem.TEXT_INSET + imageWidth, y);
if (imageHeightInPixels > headerHeightInPixels) {
OS.SetRect (rect, x + ExpandItem.TEXT_INSET, y + headerHeightInPixels - imageHeightInPixels, x + ExpandItem.TEXT_INSET + imageWidthInPixels, y);
OS.InvalidateRect (parentHandle, rect, true);
}
if (!parent.isAppThemed ()) {
OS.SetRect (rect, x, y + headerHeight, x + width, y + headerHeight + height + 1);
OS.SetRect (rect, x, y + headerHeightInPixels, x + width, y + headerHeightInPixels + height + 1);
OS.InvalidateRect (parentHandle, rect, true);
}
}
Expand All @@ -401,11 +408,8 @@ void releaseWidget () {

void setBoundsInPixels (int x, int y, int width, int height, boolean move, boolean size) {
redraw (true);
int headerHeight = parent.getBandHeight ();
int headerHeightInPixels = getHeaderHeightInPixels();
if (move) {
if (imageHeight > headerHeight) {
y += (imageHeight - headerHeight);
}
this.x = x;
this.y = y;
redraw (true);
Expand All @@ -421,8 +425,8 @@ void setBoundsInPixels (int x, int y, int width, int height, boolean move, boole
width = Math.max (0, width - BORDER * 2);
height = Math.max (0, height - BORDER);
}
if (move && size) control.setBoundsInPixels (x, y + headerHeight, width, height);
if (move && !size) control.setLocationInPixels (x, y + headerHeight);
if (move && size) control.setBoundsInPixels (x, y + headerHeightInPixels, width, height);
if (move && !size) control.setLocationInPixels (x, y + headerHeightInPixels);
if (!move && size) control.setSizeInPixels (width, height);
}
}
Expand Down Expand Up @@ -504,7 +508,7 @@ public void setImage (Image image) {
super.setImage (image);
int oldImageHeight = imageHeight;
if (image != null) {
Rectangle bounds = image.getBoundsInPixels ();
Rectangle bounds = image.getBounds();
imageHeight = bounds.height;
imageWidth = bounds.width;
} else {
Expand Down
2 changes: 1 addition & 1 deletion .../org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ControlExample.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class ControlExample {
static final int ciClosedFolder = 0, ciOpenFolder = 1, ciTarget = 2, ciBackground = 3, ciParentBackground = 4;
static final String[] imageLocations = {
"closedFolder.gif", //$NON-NLS-1$
"openFolder.gif", //$NON-NLS-1$
"pixelated.png", //$NON-NLS-1$
"target.gif", //$NON-NLS-1$
"backgroundImage.png", //$NON-NLS-1$
"parentBackgroundImage.png"}; //$NON-NLS-1$
Expand Down
1 change: 1 addition & 0 deletions ...es/org.eclipse.swt.examples/src/org/eclipse/swt/examples/controlexample/ExpandBarTab.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ void createExampleWidgets () {
item.setHeight(composite.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
item.setControl(composite);
item.setImage(instance.images[ControlExample.ciClosedFolder]);
item.setExpanded(true);

// Second item
composite = new Composite (expandBar1, SWT.NONE);
Expand Down

0 comments on commit 8aeba54

Please sign in to comment.