Import GNU Classpath (libgcj-import-20070727).
libjava/ 2007-08-04 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20070727). * Regenerate class and header files. * Regenerate auto* files. * include/jvm.h: * jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type. * jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise. * jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA, _Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA, _Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA, _Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify jvalue parameter. * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise. * java/lang/VMFloat.java (toString, parseFloat): New. * gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported, isModalExclusionTypeSupported): New (stub only). * gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise. * gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages, updateFocusableWindowState, setModalBlocked, getBoundsPrivate, setAlwaysOnTop): Likewise. * gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature. * scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer, ignore javax.sound.sampled.spi.MixerProvider, ignore .in files. * HACKING: Mention --enable-gstreamer-peer, removal of generated files. libjava/classpath/ 2007-08-04 Matthias Klose <doko@ubuntu.com> * java/util/EnumMap.java (clone): Add cast. From-SVN: r127204
This commit is contained in:
parent
2c3de459b6
commit
f06a83c0b2
522 changed files with 13385 additions and 4867 deletions
|
@ -600,8 +600,13 @@ public class BasicProgressBarUI extends ProgressBarUI
|
|||
int y, int width, int height)
|
||||
{
|
||||
Rectangle tr = new Rectangle();
|
||||
Rectangle vr = new Rectangle(x, y, width, height);
|
||||
Rectangle vr = new Rectangle();
|
||||
Rectangle ir = new Rectangle();
|
||||
|
||||
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
|
||||
vr.setBounds(x, y, width, height);
|
||||
else
|
||||
vr.setBounds(y, x, height, width);
|
||||
|
||||
Font f = g.getFont();
|
||||
FontMetrics fm = g.getFontMetrics(f);
|
||||
|
@ -611,7 +616,11 @@ public class BasicProgressBarUI extends ProgressBarUI
|
|||
SwingConstants.CENTER,
|
||||
SwingConstants.CENTER,
|
||||
SwingConstants.CENTER, vr, ir, tr, 0);
|
||||
return new Point(tr.x, tr.y);
|
||||
|
||||
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
|
||||
return new Point(tr.x, tr.y);
|
||||
else
|
||||
return new Point(tr.y, tr.x);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -741,14 +750,19 @@ public class BasicProgressBarUI extends ProgressBarUI
|
|||
{
|
||||
AffineTransform rotate = AffineTransform.getRotateInstance(Math.PI / 2);
|
||||
g.setFont(progressBar.getFont().deriveFont(rotate));
|
||||
placement.x = width - placement.x - fm.getAscent();
|
||||
}
|
||||
else
|
||||
{
|
||||
placement.y += fm.getAscent();
|
||||
}
|
||||
|
||||
g.setColor(getSelectionForeground());
|
||||
g.setClip(0, 0, full + b.left, height);
|
||||
g.drawString(str, placement.x, placement.y + fm.getAscent());
|
||||
g.drawString(str, placement.x, placement.y);
|
||||
g.setColor(getSelectionBackground());
|
||||
g.setClip(full + b.left, 0, width - full, height);
|
||||
g.drawString(str, placement.x, placement.y + fm.getAscent());
|
||||
g.drawString(str, placement.x, placement.y);
|
||||
g.setClip(savedClip);
|
||||
g.setColor(savedColor);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue