diff options
| author | Hans Boehm <Hans_Boehm@hp.com> | 2003-02-19 00:35:35 +0000 |
|---|---|---|
| committer | Hans Boehm <hboehm@gcc.gnu.org> | 2003-02-19 00:35:35 +0000 |
| commit | 56bba8cf57d0aa75d0266486595efe0d070af0b7 (patch) | |
| tree | abb4641e8aaeacc764f059098100e1aa5dde90a7 /libjava/java/awt/Scrollbar.java | |
| parent | 35bd55199796da40e73ce07ac42c4e88a9e40e6a (diff) | |
| download | gcc-56bba8cf57d0aa75d0266486595efe0d070af0b7.zip gcc-56bba8cf57d0aa75d0266486595efe0d070af0b7.tar.gz gcc-56bba8cf57d0aa75d0266486595efe0d070af0b7.tar.bz2 | |
XToolkit.java (getFontMetrics): initialize if necessary.
2003-02-18 Hans Boehm <Hans.Boehm@hp.com>
* gnu/awt/xlib/XToolkit.java (getFontMetrics): initialize
if necessary.
* gnu/java/awt/peer/gtk/GtkButtonPeer.java,
gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
(setFont, gtkSetFont): add.
gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer):
Propagate font to peer. (setFont): add FIXME comment.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
(gtkTextGetSize): fix height, width computation.
* gnu/java/awt/peer/gtk/GtkFontPeer.java (GtkFontPeer):
Make X font name a bit less bogus.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
(post_adjustment_event): Pass on GTK_SCROLL_NONE.
* java/awt/Scrollbar.java (setValues): Fix visibleAmount range check.
(processAdjustmentEvent): Adjust value.
* java/awt/FlowLayout.java (layoutContainer) Fix 2 indexing and one
logic errors.
* java/awt/Component.java (setVisible, show, hide): Call show and
hide methods in subclasses.
(getPreferredSize): don't set prefSize before we have peer.
* java/awt/TextArea.java, java/awt/TextField.java (getPreferredSize):
Guess (0,0) if we don't have peer.
From-SVN: r63077
Diffstat (limited to 'libjava/java/awt/Scrollbar.java')
| -rw-r--r-- | libjava/java/awt/Scrollbar.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libjava/java/awt/Scrollbar.java b/libjava/java/awt/Scrollbar.java index f78f402..b9a81a5 100644 --- a/libjava/java/awt/Scrollbar.java +++ b/libjava/java/awt/Scrollbar.java @@ -390,8 +390,8 @@ setValues(int value, int visibleAmount, int minimum, int maximum) if (value > maximum) value = maximum; - if (visibleAmount > value) - visibleAmount = value; + if (visibleAmount > maximum - minimum) + visibleAmount = maximum - minimum; this.value = value; this.visibleAmount = visibleAmount; @@ -664,6 +664,7 @@ processEvent(AWTEvent event) protected void processAdjustmentEvent(AdjustmentEvent event) { + value = event.getValue(); if (adjustment_listeners != null) adjustment_listeners.adjustmentValueChanged(event); } |