[commit-cp] classpath ChangeLog java/awt/GridBagLayout.java
CVSROOT:/cvsroot/classpath Module name:classpath Changes by: Tania Bento tbento06/11/01 16:59:54 Modified files: . : ChangeLog java/awt : GridBagLayout.java Log message: 2006-11-01 Tania Bento [EMAIL PROTECTED] * java/awt/GridBagLayout.java (toString): Implemented method. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpathr1=1.8742r2=1.8743 http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/GridBagLayout.java?cvsroot=classpathr1=1.31r2=1.32
[commit-cp] classpath ChangeLog java/awt/GridBagLayout.java
CVSROOT:/cvsroot/classpath Module name:classpath Changes by: Mark Wielaard mark06/07/14 21:57:17 Modified files: . : ChangeLog java/awt : GridBagLayout.java Log message: Revert to previous implementation. * java/awt/GridBagLayout.java (AdjustForGravity): Only adjust for constraints insets. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpathr1=1.8109r2=1.8110 http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/GridBagLayout.java?cvsroot=classpathr1=1.30r2=1.31
[commit-cp] classpath ChangeLog java/awt/GridBagLayout.java...
CVSROOT:/sources/classpath
Module name:classpath
Changes by: Sven de Marothy smarothy 06/06/18 02:22:17
Modified files:
. : ChangeLog
java/awt : GridBagLayout.java
java/awt/font : TextMeasurer.java
Log message:
2006-06-18 Sven de Marothy [EMAIL PROTECTED]
* java/awt/GridBagLayout.java (AdjustForGravity): Implement.
* java/awt/font/TextMeasurer.java: Fix copyright date,
remove commented-out code.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpathr1=1.7862r2=1.7863
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/GridBagLayout.java?cvsroot=classpathr1=1.28r2=1.29
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/font/TextMeasurer.java?cvsroot=classpathr1=1.4r2=1.5
Patches:
Index: ChangeLog
===
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7862
retrieving revision 1.7863
diff -u -b -r1.7862 -r1.7863
--- ChangeLog 18 Jun 2006 00:54:46 - 1.7862
+++ ChangeLog 18 Jun 2006 02:22:16 - 1.7863
@@ -1,5 +1,11 @@
2006-06-18 Sven de Marothy [EMAIL PROTECTED]
+ * java/awt/GridBagLayout.java (AdjustForGravity): Implement.
+ * java/awt/font/TextMeasurer.java: Fix copyright date,
+ remove commented-out code.
+
+2006-06-18 Sven de Marothy [EMAIL PROTECTED]
+
* gnu/java/awt/peer/gtk/FreetypeGlyphVector.java
(FreetypeGlyphVector, clone): Implement cloning.
(getGlyphLogicalBounds): Bounds should be offset to the glyph position.
Index: java/awt/GridBagLayout.java
===
RCS file: /sources/classpath/classpath/java/awt/GridBagLayout.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- java/awt/GridBagLayout.java 22 Mar 2006 19:15:24 - 1.28
+++ java/awt/GridBagLayout.java 18 Jun 2006 02:22:17 - 1.29
@@ -324,11 +324,17 @@
/**
* Obsolete.
*/
-protected void AdjustForGravity (GridBagConstraints gbc, Rectangle rect)
- throws NotImplementedException
+ protected void AdjustForGravity (GridBagConstraints constraints,
+ Rectangle rect)
{
- // FIXME
- throw new Error (Not implemented);
+Insets insets = constraints.insets;
+if (insets != null)
+ {
+ rect.x += insets.left;
+ rect.y += insets.top;
+ rect.width -= insets.left + insets.right;
+ rect.height -= insets.top + insets.bottom;
+ }
}
/**
@@ -353,10 +359,9 @@
// layoutInfo. So we wait until after this for loop to set
// layoutInfo.
Component lastComp = null;
- int cellx = 0;
- int celly = 0;
- int cellw = 0;
- int cellh = 0;
+
+ Rectangle cell = new Rectangle();
+
for (int i = 0; i components.length; i++)
{
Component component = components[i];
@@ -370,29 +375,23 @@
if (lastComp != null
constraints.gridheight == GridBagConstraints.REMAINDER)
- celly += cellh;
+ cell.y += cell.height;
else
- celly = sumIntArray(info.rowHeights, constraints.gridy);
+ cell.y = sumIntArray(info.rowHeights, constraints.gridy);
if (lastComp != null
constraints.gridwidth == GridBagConstraints.REMAINDER)
- cellx += cellw;
+ cell.x += cell.width;
else
- cellx = sumIntArray(info.colWidths, constraints.gridx);
+ cell.x = sumIntArray(info.colWidths, constraints.gridx);
-cellw = sumIntArray(info.colWidths, constraints.gridx
-+ constraints.gridwidth) - cellx;
-cellh = sumIntArray(info.rowHeights, constraints.gridy
- + constraints.gridheight) - celly;
+cell.width = sumIntArray(info.colWidths, constraints.gridx
++ constraints.gridwidth) - cell.x;
+cell.height = sumIntArray(info.rowHeights, constraints.gridy
+ + constraints.gridheight) -
cell.y;
-Insets insets = constraints.insets;
-if (insets != null)
- {
-cellx += insets.left;
-celly += insets.top;
-cellw -= insets.left + insets.right;
-cellh -= insets.top + insets.bottom;
- }
+// Adjust for insets.
+ AdjustForGravity( constraints, cell );
// Note: Documentation says that padding is added on both sides, but
// visual inspection shows that the Sun implementation only adds it
@@ -403,14 +402,14 @@
switch (constraints.fill)
{
case GridBagConstraints.HORIZONTAL:
-dim.width = cellw;
+
[commit-cp] classpath ./ChangeLog java/awt/GridBagLayout.java
CVSROOT:/sources/classpath Module name:classpath Branch: Changes by: Lillian Angel [EMAIL PROTECTED] 06/03/08 18:20:18 Modified files: . : ChangeLog java/awt : GridBagLayout.java Log message: 2006-03-08 Lillian Angel [EMAIL PROTECTED] * java/awt/GridBagLayout.java (GetLayoutInfo): If gridy is RELATIVE and there is no component in the bottom-most spot of the column, we need to place that component at the y-location of the other components in that row. If there are no other components in that row, then place it at y = 0. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6655tr2=1.6656r1=textr2=text http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/awt/GridBagLayout.java.diff?tr1=1.23tr2=1.24r1=textr2=text
[commit-cp] classpath ./ChangeLog java/awt/GridBagLayout.java
CVSROOT:/sources/classpath Module name:classpath Branch: Changes by: Lillian Angel [EMAIL PROTECTED] 06/03/10 21:01:38 Modified files: . : ChangeLog java/awt : GridBagLayout.java Log message: 2006-03-10 Lillian Angel [EMAIL PROTECTED] * java/awt/GridBagLayout.java (ArrangeGrid): Added checks to determine if component is placed last in a row or column. If so, the location of the last component should be used to get the location of the current component. CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6684tr2=1.6685r1=textr2=text http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/awt/GridBagLayout.java.diff?tr1=1.26tr2=1.27r1=textr2=text
[commit-cp] classpath ./ChangeLog java/awt/GridBagLayout.java
CVSROOT:/sources/classpath Module name:classpath Branch: Changes by: Lillian Angel [EMAIL PROTECTED] 06/03/08 20:04:13 Modified files: . : ChangeLog java/awt : GridBagLayout.java Log message: 2006-03-08 Lillian Angel [EMAIL PROTECTED] * java/awt/GridBagLayout.java (GetLayoutInfo): If the last component added had gridwidth == REMAINDER, then the next item should be set to current_y (not 0). CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.6656tr2=1.6657r1=textr2=text http://cvs.savannah.gnu.org/viewcvs/classpath/classpath/java/awt/GridBagLayout.java.diff?tr1=1.24tr2=1.25r1=textr2=text
[commit-cp] classpath ./ChangeLog java/awt/GridBagLayout.java
CVSROOT:/cvsroot/classpath Module name:classpath Branch: Changes by: Thomas Fitzsimmons [EMAIL PROTECTED] 05/12/06 21:20:18 Modified files: . : ChangeLog java/awt : GridBagLayout.java Log message: 2005-12-06 Thomas Fitzsimmons [EMAIL PROTECTED] * java/awt/GridBagLayout.java (ArrangeGrid): Use info rather than layoutInfo in the component for loop. Cache layout information after resizing components. CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.5772tr2=1.5773r1=textr2=text http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/java/awt/GridBagLayout.java.diff?tr1=1.22tr2=1.23r1=textr2=text
[commit-cp] classpath ./ChangeLog java/awt/GridBagLayout.java
CVSROOT:/cvsroot/classpath Module name:classpath Branch: Changes by: Lillian Angel [EMAIL PROTECTED] 05/10/18 20:06:15 Modified files: . : ChangeLog java/awt : GridBagLayout.java Log message: 2005-10-18 Lillian Angel [EMAIL PROTECTED] * java/awt/GridBagLayout.java (GetLayoutInfo): Added a null check for lastComponent. Prevents NPE. CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.5268tr2=1.5269r1=textr2=text http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/java/awt/GridBagLayout.java.diff?tr1=1.21tr2=1.22r1=textr2=text
[commit-cp] classpath ./ChangeLog java/awt/GridBagLayout.java
CVSROOT:/cvsroot/classpath Module name:classpath Branch: Changes by: Dalibor Topic [EMAIL PROTECTED] 05/07/10 17:24:51 Modified files: . : ChangeLog java/awt : GridBagLayout.java Log message: Small error message cleanup 2005-07-10 Dalibor Topic [EMAIL PROTECTED] * java/awt/GridBagLayout.java: (addLayoutComponent) Improved error message. CVSWeb URLs: http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/ChangeLog.diff?tr1=1.4039tr2=1.4040r1=textr2=text http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/java/awt/GridBagLayout.java.diff?tr1=1.18tr2=1.19r1=textr2=text ___ Commit-classpath mailing list Commit-classpath@gnu.org http://lists.gnu.org/mailman/listinfo/commit-classpath
