libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com> * javax/management/NotificationBroadcasterSupport.java (getNotificationInfo): Add cast. * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include directories. * native/jni/qt-peer/Makefile.in: Regenerate. libjava/ChangeLog: 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose <doko@ubuntu.com> Merged from classpath: * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge. * java/lang/System.java(inheritedChannel): New. * java/lang/Character.java: Remove stray`;'. * java/net/MulticastSocket.java: Merged. * java/text/DateFormatSymbols.java(getInstance): New, comment updates. * java/text/Collator.java(getInstance): Merged. * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG. getDisplayName, getDisplayNames: New. * java/util/logging/Logger.java: Merged. * Regenerate .class and .h files. 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/File.java: Merge with classpath-0.95, new method setFilePermissions, new attribute EXEC. * java/io/natFilePosix.cc (setFilePermissions): New. _access: Handle EXEC query. * classpath/lib/java/io/File.class, java/io/File.h: Regenerate. 2007-06-03 Matthias Klose <doko@ubuntu.com> Imported GNU Classpath 0.95. * classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/native-lib/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/examples/Makefile.in: Regenerate. * classpath/config.guess, classpath/config.sub, classpath/ltmain.sh : Update. * classpath/configure, classpath/depcomp, classpath/missing, classpath/aclocal.m4, classpath/install-sh: Regenerate. * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95. * sources.am: Regenerate. * Makefile.in: Regenerate. * Update the .class files and generated CNI header files, add new .class and generated CNI header files. * Remove generated files for removed java source files: classpath/gnu/java/net/BASE64.java, classpath/gnu/java/security/util/Base64.java, classpath/gnu/java/awt/peer/gtk/GThreadMutex.java, classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, classpath/gnu/java/awt/font/autofit/Scaler.java, classpath/gnu/classpath/jdwp/util/Value.java, classpath/gnu/javax/net/ssl/Base64.java. * Remove empty directories. * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc. * java/lang/Class.java(setAccessible): Merge from classpath. * java/util/Locale.java: Remove. * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java, gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New. * gcj/javaprims.h: Update class declarations. * scripts/classes.pl: Update usage. * HACKING: Mention to build all peers. From-SVN: r125302
This commit is contained in:
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
|
@ -574,8 +574,12 @@ public class JViewport extends JComponent implements Accessible
|
|||
Component view = getView();
|
||||
if (view == null)
|
||||
return;
|
||||
|
||||
|
||||
Point pos = getViewPosition();
|
||||
// We get the contentRect in the viewport coordinates. But we want to
|
||||
// calculate with view coordinates.
|
||||
int contentX = contentRect.x + pos.x;
|
||||
int contentY = contentRect.y + pos.y;
|
||||
Rectangle viewBounds = getView().getBounds();
|
||||
Rectangle portBounds = getBounds();
|
||||
|
||||
|
@ -584,20 +588,20 @@ public class JViewport extends JComponent implements Accessible
|
|||
|
||||
// If the bottom boundary of contentRect is below the port
|
||||
// boundaries, scroll up as necessary.
|
||||
if (contentRect.y + contentRect.height + viewBounds.y > portBounds.height)
|
||||
pos.y = contentRect.y + contentRect.height - portBounds.height;
|
||||
// If contentRect.y is above the port boundaries, scroll down to
|
||||
// contentRect.y.
|
||||
if (contentRect.y + viewBounds.y < 0)
|
||||
pos.y = contentRect.y;
|
||||
if (contentY + contentRect.height + viewBounds.y > portBounds.height)
|
||||
pos.y = contentY + contentRect.height - portBounds.height;
|
||||
// If contentY is above the port boundaries, scroll down to
|
||||
// contentY.
|
||||
if (contentY + viewBounds.y < 0)
|
||||
pos.y = contentY;
|
||||
// If the right boundary of contentRect is right from the port
|
||||
// boundaries, scroll left as necessary.
|
||||
if (contentRect.x + contentRect.width + viewBounds.x > portBounds.width)
|
||||
pos.x = contentRect.x + contentRect.width - portBounds.width;
|
||||
// If contentRect.x is left from the port boundaries, scroll right to
|
||||
if (contentX + contentRect.width + viewBounds.x > portBounds.width)
|
||||
pos.x = contentX + contentRect.width - portBounds.width;
|
||||
// If contentX is left from the port boundaries, scroll right to
|
||||
// contentRect.x.
|
||||
if (contentRect.x + viewBounds.x < 0)
|
||||
pos.x = contentRect.x;
|
||||
if (contentX + viewBounds.x < 0)
|
||||
pos.x = contentX;
|
||||
setViewPosition(pos);
|
||||
}
|
||||
|
||||
|
@ -834,7 +838,7 @@ public class JViewport extends JComponent implements Accessible
|
|||
int dy = viewPosition.y - lastPaintPosition.y;
|
||||
boolean canBlit = computeBlit(dx, dy, cachedBlitFrom, cachedBlitTo,
|
||||
cachedBlitSize, cachedBlitPaint);
|
||||
if (canBlit)
|
||||
if (canBlit && isPaintRoot)
|
||||
{
|
||||
// Copy the part that remains visible during scrolling.
|
||||
if (cachedBlitSize.width > 0 && cachedBlitSize.height > 0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue