diff options
author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2004-01-20 21:31:58 +0000 |
---|---|---|
committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2004-01-20 21:31:58 +0000 |
commit | 7a482310f0fcca71f08e2f01b9917cdcba1e4312 (patch) | |
tree | a8c4a866cc52e35d3736f2ce8a78b17faec9d743 /gnu | |
parent | b743d2f7367e26fe5702b0d5c561b42ee0473751 (diff) | |
download | classpath-7a482310f0fcca71f08e2f01b9917cdcba1e4312.tar.gz |
2004-01-20 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java (setBounds):
Calculate proper offsets for heavyweight components packed in
lightweight containers.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/java/awt/peer/gtk/GtkComponentPeer.java | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/gnu/java/awt/peer/gtk/GtkComponentPeer.java index 6f71db9f1..a92fde7f3 100644 --- a/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -42,6 +42,7 @@ import java.awt.AWTEvent; import java.awt.BufferCapabilities; import java.awt.Color; import java.awt.Component; +import java.awt.Container; import java.awt.Cursor; import java.awt.Dimension; import java.awt.Font; @@ -292,8 +293,34 @@ public class GtkComponentPeer extends GtkGenericPeer public void setBounds (int x, int y, int width, int height) { Component parent = awtComponent.getParent (); - - if (parent instanceof Window) + + // Heavyweight components that are children of one or more + // lightweight containers have to be handled specially. Because + // calls to GLightweightPeer.setBounds do nothing, GTK has no + // knowledge of the lightweight containers' positions. So we have + // to add the offsets manually when placing a heavyweight + // component within a lightweight container. The lightweight + // container may itself be in a lightweight container and so on, + // so we need to continue adding offsets until we reach a + // container whose position GTK knows -- that is, the first + // non-lightweight. + boolean lightweightChild = false; + Insets i; + while (parent.isLightweight ()) + { + lightweightChild = true; + + i = ((Container) parent).getInsets (); + + x += parent.getX () + i.left; + y += parent.getY () + i.top; + + parent = parent.getParent (); + } + + // We only need to convert from Java to GTK coordinates if we're + // placing a heavyweight component in a Window. + if (parent instanceof Window && !lightweightChild) { Insets insets = ((Window) parent).getInsets (); // Convert from Java coordinates to GTK coordinates. |