2004-02-04 20:43:32 +00:00
|
|
|
/* SwingUtilities.java --
|
AbstractButton.java, [...]: Cleaned up imports.
2004-05-05 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java,
javax/swing/ActionMap.java,
javax/swing/DefaultButtonModel.java,
javax/swing/DefaultListModel.java,
javax/swing/ImageIcon.java,
javax/swing/JComboBox.java,
javax/swing/JComponent.java,
javax/swing/JFrame.java,
javax/swing/JInternalFrame.java,
javax/swing/JMenuBar.java,
javax/swing/JMenuItem.java,
javax/swing/JOptionPane.java,
javax/swing/JProgressBar.java,
javax/swing/JRootPane.java,
javax/swing/JScrollBar.java,
javax/swing/JScrollPane.java,
javax/swing/JSeparator.java,
javax/swing/JSlider.java,
javax/swing/JTabbedPane.java,
javax/swing/JTable.java,
javax/swing/JTextField.java,
javax/swing/JToolBar.java,
javax/swing/JToolTip.java,
javax/swing/JTree.java,
javax/swing/JViewport.java,
javax/swing/JWindow.java,
javax/swing/KeyStroke.java,
javax/swing/LookAndFeel.java,
javax/swing/SwingUtilities.java,
javax/swing/Timer.java,
javax/swing/ToolTipManager.java,
javax/swing/UIDefaults.java,
javax/swing/border/TitledBorder.java,
javax/swing/filechooser/FileSystemView.java,
javax/swing/plaf/basic/BasicButtonListener.java,
javax/swing/plaf/basic/BasicButtonUI.java,
javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java,
javax/swing/plaf/basic/BasicGraphicsUtils.java,
javax/swing/plaf/basic/BasicLabelUI.java,
javax/swing/plaf/basic/BasicMenuItemUI.java,
javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java,
javax/swing/plaf/basic/BasicRootPaneUI.java,
javax/swing/plaf/basic/BasicScrollBarUI.java,
javax/swing/plaf/basic/BasicScrollPaneUI.java,
javax/swing/plaf/basic/BasicSliderUI.java,
javax/swing/plaf/basic/BasicTabbedPaneUI.java,
javax/swing/plaf/basic/BasicToggleButtonUI.java,
javax/swing/table/JTableHeader.java,
javax/swing/text/AbstractDocument.java,
javax/swing/text/DefaultCaret.java,
javax/swing/text/StyledEditorKit.java,
javax/swing/tree/DefaultTreeCellEditor.java:
Cleaned up imports.
From-SVN: r81517
2004-05-05 09:16:18 +00:00
|
|
|
Copyright (C) 2002, 2004 Free Software Foundation, Inc.
|
2002-08-09 04:26:17 +00:00
|
|
|
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 USA.
|
|
|
|
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
|
|
making a combined work based on this library. Thus, the terms and
|
|
|
|
conditions of the GNU General Public License cover the whole
|
|
|
|
combination.
|
|
|
|
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
|
|
permission to link this library with independent modules to produce an
|
|
|
|
executable, regardless of the license terms of these independent
|
|
|
|
modules, and to copy and distribute the resulting executable under
|
|
|
|
terms of your choice, provided that you also meet, for each linked
|
|
|
|
independent module, the terms and conditions of the license of that
|
|
|
|
module. An independent module is a module which is not derived from
|
|
|
|
or based on this library. If you modify this library, you may extend
|
|
|
|
this exception to your version of the library, but you are not
|
|
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
|
|
exception statement from your version. */
|
|
|
|
|
2003-06-19 16:30:09 +00:00
|
|
|
package javax.swing;
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
import java.applet.Applet;
|
2003-06-19 16:30:09 +00:00
|
|
|
import java.awt.Component;
|
2004-02-04 20:43:32 +00:00
|
|
|
import java.awt.ComponentOrientation;
|
2003-06-19 16:30:09 +00:00
|
|
|
import java.awt.Container;
|
|
|
|
import java.awt.Font;
|
|
|
|
import java.awt.FontMetrics;
|
|
|
|
import java.awt.Graphics;
|
|
|
|
import java.awt.Insets;
|
|
|
|
import java.awt.Point;
|
|
|
|
import java.awt.Rectangle;
|
[multiple changes]
2004-03-12 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes.
* javax/swing/JComponent.java (paint): Use persistent double buffer.
* javax/swing/JList.java (ListListener): Revalidate on changes.
* javax/swing/JScrollPane.java: Reimplement.
* javax/swing/JViewport.java: Reimplement.
* javax/swing/ScrollPaneLayout.java: Reimplement.
* javax/swing/ViewportLayout.java: Tidy up.
* javax/swing/plaf/basic/BasicButtonListener.java: Remove printlns.
* javax/swing/plaf/basic/BasicScrollPaneUI.java: Reimplement.
* javax/swing/plaf/basic/BasicSliderUI.java: Handle missing labels.
* javax/swing/plaf/basic/BasicViewportUI.java: Implement in terms of
backing store only.
2004-03-11 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_wm_protocols_filter): New function.
(window_focus_in_cb): Remove function.
(window_focus_out_cb): Likewise.
(window_focus_or_active_state_change_cb): New function.
(create): Add filter that removes WM_TAKE_FOCUS client messages.
(connectSignals): Don't attach handlers to focus-in-event or
focus-out-event signals. Handle notify signal.
2004-03-11 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetLabel): New native method declaration.
(setLabel): Use gtkSetLabel.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel): New method.
2004-03-10 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Default to
black when color argument is null.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: Remove check
for drag events.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild):
Remove candidate clip. Use the component
clip to intersect.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Use the PaintEvent's clip.
2004-03-10 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Don't set the clip for the
Graphics object.
2004-03-09 Graydon Hoare <graydon@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
Fix double <-> fixed macros, reset font transform.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
Likewise.
2004-03-09�� Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild): Move
the x and y coordinate of the component rectangle
to correct position.
(handleEvent): Forward drag events to the pressed
component.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Fix comments.
(ArrowButtonListener::mousePressed): Stop the
existing timer.
(mouseDragged): Implement.
(TrackListener::mousePressed): Only react if
the press doesn't occur on the thumb, otherwise
just set the offset.
(TrackListener::mouseReleased): Unset the isAdjusting
value.
(createIncreaseIcon): Switch icon.
(createDecreaseIcon): Switch icon.
(calculatePreferredSize): Use width.
(getThumbBounds): Use the top as the lower value.
(layoutVScrollBar): Switch the button locations.
(paintIncreaseHighlight): Paint correct side of thumb.
(paintDecreaseHighlight): ditto.
(valueForYPosition): Use top as the lower value.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix comments.
(mouseDragged): Implement.
(mousePressed): Only react when the thumb isn't
pressed, otherwise just set offset.
(mouseReleased): Handle a release of the thumb.
(scrollDueToClickInTrack): Stop the timer first.
* javax/swing/JProgressBar.java:
(setString): Fix change condition.
* javax/swing/JSeparator.java:
Remove println's.
2004-03-08 David Jee <djee@redhat.com>
* java/awt/image/AffineTransformOp.java:
(filter): Use Graphics2D interface instead of directly using the
GdkGraphics2D peer.
2004-03-05 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkButtonPeer.java
(handleEvent): Action events are generated upon MOUSE_RELEASED.
* java/awt/Container.java
(acquireComponentForMouseEvent): Fixed.
(handleEvent): Fixed.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(state_to_awt_mods_with_button_states): New method.
(pre_event_handler): Fixed mouse event generation.
2004-03-05 Olga Rodimina <rodimina@redhat.com>
gnu/java/awt/peer/gtk/GdkGraphics2D.java
(GdkGraphics2D (BufferedImage)): Initialize
pixmap associated with specified BufferedImage.
(setPaint): Changed implementation of Texture
Paint to use AffineTransformOp.
* java/awt/image/AffineTransformOp.java
(createCompatibleDestRaster): Throw RasterFormatException
if resulting width or height of raster is 0.
2004-03-04 Olga Rodimina <rodimina@redhat.com>
* java/awt/image/AffineTransformOp.java:
Removed unnecessary field interpolationType.
Formatted some of the lines to be consistent with
the GNU style.
(AffineTransformOp): Create new RenderingHints
containing specified interpolation type.
(createCompatibleDestImage): Implemented.
(createCompatibleDestRaster): Implemented.
(filter): Implemented.
(getBounds2D(BufferedImage)): Implemented.
(getBounds2D(Raster)): Implemented.
(getInterpolationType): Get interpolation value from
rendering hints.
2004-03-04 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): Check if child peers are null.
2004-03-04 Graydon Hoare <graydon@redhat.com>
* testsuite/lib/libjava.exp (libjava_find_lib): Don't include
.libs in -L option.
(libjava_arguments): Add new libraries to argument list.
2004-03-04 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_LTLIBRARIES): Added lib-java-awt.la,
lib-javax-swing.la, lib-java-applet.la, lib-java-beans.la.
(misc_java_source_files): New macro.
(swing_java_source_files): Likewise.
(awt_java_source_files): Pruned.
(applet_java_source_files): New macro.
(beans_java_source_files): Likewise.
(lib_java_applet_la_SOURCES): Likewise.
(lib_java_awt_la_SOURCES): Likewise.
(lib_javax_swing_la_SOURCES): Likewise.
(lib_java_beans_la_SOURCES): Likewise.
(all_java_object_files): Likewise.
(%.lo: %.java): Use all_java_object_files.
(all_java_source_files): Added new _SOURCES.
(ordinary_java_source_files): Removed awt_java_source_files.
2004-03-02 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added java/awt/image/AffineTransformOp.java
* Makefile.in: Re-generated.
* java/awt/image/AffineTransformOp.java: New Class.
2004-03-01 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(setPaint): Interpret correctly TexturePaint's
anchor rectangle.
(drawImage): Fixed scale factors of the affine
transform.
2004-02-27 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(GdkGraphics(Component)): Inherit font from component.
(drawString): Use font style.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetFont): New native method declaration.
(setFont): New method.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(gtkSetFont): New native method declaration.
(setFont): Call new native method gtkSetFont.
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): For all child components who do not their fonts set,
set their peers' fonts with this container's font.
* gnu/java/awt/peer/gtk/GtkLabelPeer.java:
Move all native method declarations to the top for readability.
(gtkSetFont): New native method declaration.
(setFont): New method.
* java/awt/Component.java
(setFont): Invalidate after setting the font.
* java/awt/Container.java
(invalidateTree): New method.
(setFont): Invalidate the container tree after setting the font.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString): Use font style.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
(Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont): New method.
2004-02-27 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(updateBufferedImage): New helper function.
Updates BufferedImage in memory if it was changed.
(draw): changed to update BufferedImage in memory after
this drawing operation
(fill): Ditto.
(draw3DRect): Ditto.
(fill3DRect): Ditto.
(clearRect): Ditto.
(drawRaster): Ditto.
(drawImage) : Ditto. Update only in case of GtkOffScreenImage with
no affine transformation.
(drawGlyphVector): Ditto.
2004-02-26 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(isBufferedImageGraphics): New Helper function.
Returns true if this graphics2d can be used to draw
into buffered image and false otherwise.
(updateImagePixels): New Helper function.
Updates pixels in the BufferedImage.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
(getImagePixels): New function. Returns pixels
of the buffered image associated with
this Graphics2D.
2004-02-26 David Jee <djee@redhat.com>
* java/awt/BorderLayout.java
(layoutContainer): Fix width and height calculations to ensure
that they're non-negative.
* java/awt/Component.java
(setBackground): If c is null, inherit from closest ancestor whose
background color is set.
2004-02-26�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Add new files.
* Makefile.in: Re-generate.
* javax/swing/JProgressBar.java:
(JProgressBar(int, int int)): Throw
IllegalArgumentException if orientation is
invalid.
(JProgressBar(BoundedRangeModel)): Create
ChangeListener and register it. UpdateUI.
(getChangeListeners): Implement.
(setModel): Reset ChangeListener.
* javax/swing/JScrollBar.java: Implement.
* javax/swing/JSeparator.java: Implement.
* javax/swing/JSlider.java:
(JSlider(int, int, int, int)): Throw
IllegalArgumentException if orientation
is invalid.
(getChangeListeners): Fix method name.
* javax/swing/SwingUtilities.java:
(layoutCompoundLabel): If there is no text,
set the text rectangle dimensions to 0.
* javax/swing/plaf/basic/BasicButtonUI.java:
(paint): If there is no text, don't paint it.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Implement.
* javax/swing/plaf/basic/BasicSeparatorUI.java:
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java:
(propertyChange): If the model changes, change
the listeners accordingly.
2004-02-25 Graydon Hoare <graydon@redhat.com>
* javax/swing/AbstractButton.java: Add "final" qualifiers.
* javax/swing/JList.java: Reimplement.
* javax/swing/DefaultListSelectionModel.java: Reimplement.
* javax/swing/plaf/basic/BasicListUI.java: Reimplement.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add "purple" values.
* javax/swing/ListModel.java: Javadoc.
* javax/swing/ListSelectionModel.java: Add missing methods.
* javax/swing/AbstractListModel.java: Javadoc and corrections.
* javax/swing/DefaultListModel.java: Javadoc and corrections.
* javax/swing/ListModel.java: Javadoc and corrections.
* javax/swing/DefaultListCellRenderer.java: Minor tidying.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer): Change default size to 12.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer): Change default size to 12.
(getClasspathFontPeer): Likewise. Set default name to "Default".
* java/awt/Font.java
(Font(Map)): Call Font(String,Map).
(Font(String,Map)): If attrs is null, initialize it as an empty
HashMap, which will ensure that the Font will get default attributes.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer(String,int)): Call the new constructor with size 1.
(GtkFontPeer(String,int,int)): New constructor with size attribute.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer(String,int)): Call the new overload method with size 1.
(getFontPeer(String,int,int)): New method. Overloaded with size
attribute.
(getClasspathFontPeer): Set the size of the font.
2004-02-24 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(bimage): New field.
(GdkGraphics2D): New Constructor. Constructs Graphics
object that can be used to draw into the Buffered Image.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
(GdkGraphicsEnvironment): Fixed to include public
keyword.
(createGraphics): Implemented.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getLocalGraphicsEnvironment): Implemented.
* java/awt/GraphicsEnvironment.java:
(getLocalGraphicsEnvironment): Implemented.
* java/awt/image/BufferedImage.java:
(createGraphics): Implemented.
2004-02-24 David Jee <djee@redhat.com>
* java/awt/Component.java
(eventTypeEnabled): Add MOUSE_MOVED and MOUSE_DRAGGED event types.
* java/awt/Container.java
(addNotifyContainerChildren): Fix event enabling.
2004-02-23 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added
gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
* Makefile.in: Re-generated.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
New Class.
2004-02-19 Kim Ho <kho@redhat.com>
* Makefile.am: Add BasicProgressBarUI
* Makefile.in: Regenerate.
* javax/swing/JProgressBar.java:
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java
Add constants for JProgressBar.
* javax/swing/plaf/basic/BasicProgressBarUI.java
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java
Change comments.
(calculateGeometry): New method
(paint): Remove unnecessary size calculations.
2004-02-18 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(drawRaster): Fixed small error that caused
imageToUser transformation to be set incorrectly.
(toString): Implemented.
2004-02-18 David Jee <djee@redhat.com>
* java/awt/CardLayout.java
(addLayoutComponent): Show the first component added as the default.
(removeLayoutComponent): After removing, show the next component.
(gotoComponent): If there is only one component, show it and return.
2004-02-18 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Re-order
modifiers.
* javax/swing/JLabel.java: Re-order
modifiers.
* javax/swing/JComponent.java:
(addPropertyChangeListener):
Implement.
(removePropertyChangeListener):
ditto.
(firePropertyChangeEvent):
ditto.
2004-02-17 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch ComponentEvent via system event queue.
(hide): Likewise.
(move): Likewise.
(resize): Likewise.
(reshape): Likewise.
* java/awt/Window.java
(setBoundsCallback): Likewise.
2004-02-17 David Jee <djee@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds):
Use gtk_widget_set_size_request() instead of the deprecated
gtk_widget_set_usize().
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Fix comments and
make property strings constants.
(createStandardLabels): Use the labels
preferred size as bounds.
* javax/swing/plaf/basic/BasicSliderUI.java
Fix comments.
(ScrollHandler::actionPerformed): Don't
calculate the timer stop value. Let the
MouseListeners find the stop location.
(getPreferredHorizontalSize): Re-implement.
(getPreferredVerticalSize): ditto.
(getMinimumHorizontalSize): ditto.
(getMinimumVerticalSize): ditto.
(getPreferredSize): ditto.
(getMinimumSize): ditto.
(getMaximumSize): ditto.
(paintTicks): Use doubles to find the
tick location.
(paintHorizontalLabel):�� Use preferredSize
as initial width and height.
(paintVerticalLabel): ditto.
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Changed
property strings to constants.
(DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY):
New property.
(setText): Change mnemonic index if
text is too short.
(setDisplayedMnemonicIndex): Fire property
change event.
(getDisplayedMnemonicIndex): Remove check
against short text.
2004-02-17 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(drawImage(img,xform,obs)): Invert xform before
passing the xform to cairo.
(drawImage(img,x,y,bgcolor,obs)): Implemented.
(drawImage (img,x,y,w,h,bgcolor,obs)): Partly
implemented.
(drawImage (img,x,y,w,h,obs)): Implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,
bgcolor,obs)): Partly implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,obs)):
Implemented.
* java/awt/image/BufferedImage.java:
(copyData): if dest is null, create raster with same
dimensions as the current image.
2004-02-16 Graydon Hoare <graydon@redhat.com>
* javax/swing/plaf/basic/BasicLabelUI.java
(getPreferredSize): Use layoutCL.
* javax/swing/plaf/basic/BasicGraphicsUtils.java
(getPreferredButtonSize): Start with empty view rect, layout using
component's preferred alignment.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add some Label and
List defaults.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch COMPONENT_SHOWN ComponentEvent.
(hide): Dispatch COMPONENT_HIDDEN ComponentEvent.
(move): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_MOVED ComponentEvent.
(resize): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_RESIZED ComponentEvent.
(reshape): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
* java/awt/Window.java
(setBoundsCallback): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
2004-02-16 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(setRenderingHint): Added implementation of
Interpolation rendering hints.
(setRenderingHints): Ditto.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
(drawPixels): fixed to allow user to choose type
of filtering that should be used when displaying images.
(cairoSurfaceSetFilter): New method. Sets filter type for
interpolation of pixel values.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(calcCellSizes): Rows or columns with zero sizes should still be
considered for extra space distribution.
2004-02-16 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Re-implement.
* javax/swing/plaf/basic/BasicLabelUI.java
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Added constant.
2004-02-16�� Kim Ho�� <kho@redhat.com>
* javax/swing/JSlider.java: Fix indentation and comments.
(setModel): Remove null check to conform with Sun's.
(setOrientation): Throw exception if not
HORIZONTAL or VERTICAL.
(getInverted): Use private variable instead of
ComponentOrientation.
(setInverted): ditto.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix indentation and comments.
(propertyChange): Remove check for inverted slider, handle
in main paint.
(getMinimumSize): Return preferred size.
(getMaximumSize): ditto.
(calculateFocusRect): Don't relocate rectangle.
(drawInverted): Return XOR of the slider's inversion and
the component's orientation.
(paint): Update leftToRightCache
2004-02-13 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(GetLayoutInfo): Fix weight and size distribution. Relocate repeated
code to helper methods.
(sortBySpan): New helper method.
(distributeSizeAndWeight): Likewise.
(calcCellWeights): Likewise.
(calcCellSizes): Add comments.
2004-02-13 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Only do something if component is invisible at the moment.
(hide): Only do something if component is visible at the moment.
(reshape): If lightweight, erase old bounds and repaint new bounds.
2004-02-13�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Updated for new file.
* Makefile.in: Regenerated.
* javax/swing/JSlider.java: Reimplement.
* javax/swing/SwingUtilities.java
(layoutCompoundLabel): Use icon height
instead of width.
(paintComponent): Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Add JSlider defaults.
* javax/swing/plaf/basic/BasicSliderUI.java:
Implement. New file.
From-SVN: r79607
2004-03-17 21:29:02 +00:00
|
|
|
import java.awt.Shape;
|
2003-06-19 16:30:09 +00:00
|
|
|
import java.awt.Toolkit;
|
|
|
|
import java.awt.Window;
|
|
|
|
import java.awt.event.MouseEvent;
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* This class contains a number of static utility functions which are
|
|
|
|
* useful when drawing swing components, dispatching events, or calculating
|
|
|
|
* regions which need painting.
|
|
|
|
*
|
|
|
|
* @author Graydon Hoare (graydon&064;redhat.com)
|
|
|
|
*/
|
2003-06-19 16:30:09 +00:00
|
|
|
public class SwingUtilities implements SwingConstants
|
|
|
|
{
|
2004-02-04 20:43:32 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Calculates the portion of the base rectangle which is inside the
|
|
|
|
* insets.
|
|
|
|
*
|
|
|
|
* @param base The rectangle to apply the insets to
|
|
|
|
* @param insets The insets to apply to the base rectangle
|
|
|
|
* @param ret A rectangle to use for storing the return value, or
|
|
|
|
* <code>null</code>
|
|
|
|
*
|
|
|
|
* @return The calculated area inside the base rectangle and its insets,
|
|
|
|
* either stored in ret or a new Rectangle if ret is <code>null</code>
|
|
|
|
*
|
|
|
|
* @see #calculateInnerArea
|
|
|
|
*/
|
|
|
|
public static Rectangle calculateInsetArea(Rectangle base, Insets insets,
|
|
|
|
Rectangle ret)
|
|
|
|
{
|
|
|
|
if (ret == null)
|
|
|
|
ret = new Rectangle();
|
|
|
|
ret.setBounds(base.x + insets.left, base.y + insets.top,
|
|
|
|
base.width - (insets.left + insets.right),
|
|
|
|
base.height - (insets.top + insets.bottom));
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Calculates the portion of the component's bounds which is inside the
|
|
|
|
* component's border insets. This area is usually the area a component
|
2004-02-12 00:17:26 +00:00
|
|
|
* should confine its painting to. The coordinates are returned in terms
|
|
|
|
* of the <em>component's</em> coordinate system, where (0,0) is the
|
|
|
|
* upper left corner of the component's bounds.
|
2004-02-04 20:43:32 +00:00
|
|
|
*
|
|
|
|
* @param c The component to measure the bounds of
|
|
|
|
* @param r A Rectangle to store the return value in, or
|
|
|
|
* <code>null</code>
|
|
|
|
*
|
|
|
|
* @return The calculated area inside the component and its border
|
|
|
|
* insets
|
|
|
|
*
|
|
|
|
* @see #calculateInsetArea
|
|
|
|
*/
|
|
|
|
public static Rectangle calculateInnerArea(JComponent c, Rectangle r)
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
{
|
2004-02-12 00:17:26 +00:00
|
|
|
Rectangle b = getLocalBounds(c);
|
|
|
|
return calculateInsetArea(b, c.getInsets(), r);
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
/**
|
|
|
|
* Calculates the bounds of a component in the component's own coordinate
|
|
|
|
* space. The result has the same height and width as the component's
|
|
|
|
* bounds, but its location is set to (0,0).
|
|
|
|
*
|
|
|
|
* @param aComponent The component to measure
|
|
|
|
*
|
|
|
|
* @return The component's bounds in its local coordinate space
|
|
|
|
*/
|
|
|
|
public static Rectangle getLocalBounds(Component aComponent)
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
{
|
2004-02-04 20:43:32 +00:00
|
|
|
Rectangle bounds = aComponent.getBounds();
|
2004-02-12 00:17:26 +00:00
|
|
|
return new Rectangle(0, 0, bounds.width, bounds.height);
|
2004-02-04 20:43:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the font metrics object for a given font. The metrics can be
|
|
|
|
* used to calculate crude bounding boxes and positioning information,
|
|
|
|
* for laying out components with textual elements.
|
|
|
|
*
|
|
|
|
* @param font The font to get metrics for
|
|
|
|
*
|
|
|
|
* @return The font's metrics
|
|
|
|
*
|
|
|
|
* @see java.awt.font.GlyphMetrics
|
|
|
|
*/
|
|
|
|
public static FontMetrics getFontMetrics(Font font)
|
|
|
|
{
|
|
|
|
return Toolkit.getDefaultToolkit().getFontMetrics(font);
|
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
/**
|
|
|
|
* If <code>comp</code> is a RootPaneContainer, return its JRootPane.
|
|
|
|
* Otherwise call <code>getAncestorOfClass(JRootPane.class, a)</code>.
|
|
|
|
*
|
|
|
|
* @param comp The component to get the JRootPane of
|
|
|
|
*
|
|
|
|
* @return a suitable JRootPane for <code>comp</code>, or <code>null</code>
|
|
|
|
*
|
|
|
|
* @see javax.swing.RootPaneContainer#getRootPane
|
|
|
|
* @see #getAncestorOfClass
|
|
|
|
*/
|
|
|
|
public static JRootPane getRootPane(Component comp)
|
|
|
|
{
|
|
|
|
if (comp instanceof RootPaneContainer)
|
|
|
|
return ((RootPaneContainer)comp).getRootPane();
|
|
|
|
else
|
|
|
|
return (JRootPane) getAncestorOfClass(JRootPane.class, comp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the least ancestor of <code>comp</code> which has the
|
|
|
|
* specified name.
|
|
|
|
*
|
|
|
|
* @param name The name to search for
|
|
|
|
* @param comp The component to search the ancestors of
|
|
|
|
*
|
|
|
|
* @return The nearest ancestor of <code>comp</code> with the given
|
|
|
|
* name, or <code>null</code> if no such ancestor exists
|
|
|
|
*
|
|
|
|
* @see java.awt.Component#getName
|
|
|
|
* @see #getAncestorOfClass
|
|
|
|
*/
|
|
|
|
public static Container getAncestorNamed(String name, Component comp)
|
|
|
|
{
|
|
|
|
while (comp != null && (comp.getName() != name))
|
|
|
|
comp = comp.getParent();
|
|
|
|
return (Container) comp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the least ancestor of <code>comp</code> which is an instance
|
|
|
|
* of the specified class.
|
|
|
|
*
|
|
|
|
* @param c The class to search for
|
|
|
|
* @param comp The component to search the ancestors of
|
|
|
|
*
|
|
|
|
* @return The nearest ancestor of <code>comp</code> which is an instance
|
|
|
|
* of the given class, or <code>null</code> if no such ancestor exists
|
|
|
|
*
|
|
|
|
* @see #getAncestorOfClass
|
|
|
|
* @see #windowForComponent
|
|
|
|
* @see
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
public static Container getAncestorOfClass(Class c, Component comp)
|
|
|
|
{
|
|
|
|
while (comp != null && (! c.isInstance(comp)))
|
|
|
|
comp = comp.getParent();
|
|
|
|
return (Container) comp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Equivalent to calling <code>getAncestorOfClass(Window, comp)</code>.
|
|
|
|
*
|
|
|
|
* @param comp The component to search for an ancestor window
|
|
|
|
*
|
|
|
|
* @return An ancestral window, or <code>null</code> if none exists
|
|
|
|
*/
|
|
|
|
public static Window windowForComponent(Component comp)
|
|
|
|
{
|
|
|
|
return (Window) getAncestorOfClass(Window.class, comp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the "root" of the component tree containint <code>comp</code>
|
|
|
|
* The root is defined as either the <em>least</em> ancestor of
|
|
|
|
* <code>comp</code> which is a {@link Window}, or the <em>greatest</em>
|
|
|
|
* ancestor of <code>comp</code> which is a {@link Applet} if no {@link
|
|
|
|
* Window} ancestors are found.
|
|
|
|
*
|
|
|
|
* @param comp The component to search for a root
|
|
|
|
*
|
|
|
|
* @return The root of the component's tree, or <code>null</code>
|
|
|
|
*/
|
|
|
|
public static Component getRoot(Component comp)
|
|
|
|
{
|
|
|
|
Applet app = null;
|
|
|
|
Window win = null;
|
|
|
|
|
|
|
|
while (comp != null)
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
{
|
2004-02-04 20:43:32 +00:00
|
|
|
if (win == null && comp instanceof Window)
|
|
|
|
win = (Window) comp;
|
|
|
|
else if (comp instanceof Applet)
|
|
|
|
app = (Applet) comp;
|
|
|
|
comp = comp.getParent();
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
}
|
2004-02-04 20:43:32 +00:00
|
|
|
|
|
|
|
if (win != null)
|
|
|
|
return win;
|
|
|
|
else
|
|
|
|
return app;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Return true if a descends from b, in other words if b is an
|
|
|
|
* ancestor of a.
|
|
|
|
*
|
|
|
|
* @param a The child to search the ancestry of
|
|
|
|
* @param b The potential ancestor to search for
|
|
|
|
*
|
|
|
|
* @return true if a is a descendent of b, false otherwise
|
|
|
|
*/
|
|
|
|
public static boolean isDescendingFrom(Component a, Component b)
|
|
|
|
{
|
|
|
|
while (true)
|
|
|
|
{
|
|
|
|
if (a == null || b == null)
|
|
|
|
return false;
|
|
|
|
if (a == b)
|
|
|
|
return true;
|
|
|
|
a = a.getParent();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the deepest descendent of parent which is both visible and
|
|
|
|
* contains the point <code>(x,y)</code>. Returns parent when either
|
|
|
|
* parent is not a container, or has no children which contain
|
|
|
|
* <code>(x,y)</code>. Returns <code>null</code> when either
|
|
|
|
* <code>(x,y)</code> is outside the bounds of parent, or parent is
|
|
|
|
* <code>null</code>.
|
|
|
|
*
|
|
|
|
* @param parent The component to search the descendents of
|
|
|
|
* @param x Horizontal coordinate to search for
|
|
|
|
* @param y Vertical coordinate to search for
|
|
|
|
*
|
|
|
|
* @return A component containing <code>(x,y)</code>, or
|
|
|
|
* <code>null</code>
|
|
|
|
*
|
|
|
|
* @see java.awt.Container#findComponentAt
|
|
|
|
*/
|
|
|
|
public static Component getDeepestComponentAt(Component parent, int x, int y)
|
|
|
|
{
|
|
|
|
if (parent == null || (! parent.contains(x, y)))
|
|
|
|
return null;
|
|
|
|
|
|
|
|
if (! (parent instanceof Container))
|
|
|
|
return parent;
|
|
|
|
|
|
|
|
Container c = (Container) parent;
|
|
|
|
return c.findComponentAt(x, y);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Converts a point from a component's local coordinate space to "screen"
|
|
|
|
* coordinates (such as the coordinate space mouse events are delivered
|
|
|
|
* in). This operation is equivalent to translating the point by the
|
|
|
|
* location of the component (which is the origin of its coordinate
|
|
|
|
* space).
|
|
|
|
*
|
|
|
|
* @param p The point to convert
|
|
|
|
* @param c The component which the point is expressed in terms of
|
|
|
|
*
|
|
|
|
* @see convertPointFromScreen
|
|
|
|
*/
|
|
|
|
public static void convertPointToScreen(Point p, Component c)
|
|
|
|
{
|
|
|
|
Point c0 = c.getLocationOnScreen();
|
|
|
|
p.translate(c0.x, c0.y);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Converts a point from "screen" coordinates (such as the coordinate
|
|
|
|
* space mouse events are delivered in) to a component's local coordinate
|
|
|
|
* space. This operation is equivalent to translating the point by the
|
|
|
|
* negation of the component's location (which is the origin of its
|
|
|
|
* coordinate space).
|
|
|
|
*
|
|
|
|
* @param p The point to convert
|
|
|
|
* @param c The component which the point should be expressed in terms of
|
|
|
|
*/
|
|
|
|
public static void convertPointFromScreen(Point p, Component c)
|
|
|
|
{
|
|
|
|
Point c0 = c.getLocationOnScreen();
|
|
|
|
p.translate(-c0.x, -c0.y);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Converts a point <code>(x,y)</code> from the coordinate space of one
|
|
|
|
* component to another. This is equivalent to converting the point from
|
|
|
|
* <code>source</code> space to screen space, then back from screen space
|
|
|
|
* to <code>destination</code> space. If exactly one of the two
|
|
|
|
* Components is <code>null</code>, it is taken to refer to the root
|
|
|
|
* ancestor of the other component. If both are <code>null</code>, no
|
|
|
|
* transformation is done.
|
|
|
|
*
|
|
|
|
* @param source The component which the point is expressed in terms of
|
|
|
|
* @param x Horizontal coordinate of point to transform
|
|
|
|
* @param y Vertical coordinate of point to transform
|
|
|
|
* @param destination The component which the return value will be
|
|
|
|
* expressed in terms of
|
|
|
|
*
|
|
|
|
* @return The point <code>(x,y)</code> converted from the coordinate space of the
|
|
|
|
* source component to the coordinate space of the destination component
|
|
|
|
*
|
|
|
|
* @see #convertPointToScreen
|
|
|
|
* @see #convertPointFromScreen
|
|
|
|
* @see #convertRectangle
|
|
|
|
* @see #getRoot
|
|
|
|
*/
|
|
|
|
public static Point convertPoint(Component source, int x, int y,
|
|
|
|
Component destination)
|
|
|
|
{
|
|
|
|
Point pt = new Point(x, y);
|
|
|
|
|
|
|
|
if (source == null && destination == null)
|
|
|
|
return pt;
|
|
|
|
|
|
|
|
if (source == null)
|
|
|
|
source = getRoot(destination);
|
|
|
|
|
|
|
|
if (destination == null)
|
|
|
|
destination = getRoot(source);
|
|
|
|
|
|
|
|
convertPointToScreen(pt, source);
|
|
|
|
convertPointFromScreen(pt, destination);
|
|
|
|
|
|
|
|
return pt;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Converts a rectangle from the coordinate space of one component to
|
|
|
|
* another. This is equivalent to converting the rectangle from
|
|
|
|
* <code>source</code> space to screen space, then back from screen space
|
|
|
|
* to <code>destination</code> space. If exactly one of the two
|
|
|
|
* Components is <code>null</code>, it is taken to refer to the root
|
|
|
|
* ancestor of the other component. If both are <code>null</code>, no
|
|
|
|
* transformation is done.
|
|
|
|
*
|
|
|
|
* @param source The component which the rectangle is expressed in terms of
|
|
|
|
* @param rect The rectangle to convert
|
|
|
|
* @param destination The component which the return value will be
|
|
|
|
* expressed in terms of
|
|
|
|
*
|
|
|
|
* @return A new rectangle, equal in size to the input rectangle, but
|
|
|
|
* with its position converted from the coordinate space of the source
|
|
|
|
* component to the coordinate space of the destination component
|
|
|
|
*
|
|
|
|
* @see #convertPointToScreen
|
|
|
|
* @see #convertPointFromScreen
|
|
|
|
* @see #convertPoint
|
|
|
|
* @see #getRoot
|
|
|
|
*/
|
|
|
|
public static Rectangle convertRectangle(Component source,
|
|
|
|
Rectangle rect,
|
|
|
|
Component destination)
|
|
|
|
{
|
|
|
|
Point pt = convertPoint(source, rect.x, rect.y, destination);
|
|
|
|
return new Rectangle(pt.x, pt.y, rect.width, rect.height);
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
/**
|
|
|
|
* Convert a mouse event which refrers to one component to another. This
|
|
|
|
* includes changing the mouse event's coordinate space, as well as the
|
|
|
|
* source property of the event. If <code>source</code> is
|
|
|
|
* <code>null</code>, it is taken to refer to <code>destination</code>'s
|
|
|
|
* root component. If <code>destination</code> is <code>null</code>, the
|
|
|
|
* new event will remain expressed in <code>source</code>'s coordinate
|
|
|
|
* system.
|
|
|
|
*
|
|
|
|
* @param source The component the mouse event currently refers to
|
|
|
|
* @param sourceEvent The mouse event to convert
|
|
|
|
* @param destination The component the new mouse event should refer to
|
|
|
|
*
|
|
|
|
* @return A new mouse event expressed in terms of the destination
|
|
|
|
* component's coordinate space, and with the destination component as
|
|
|
|
* its source
|
|
|
|
*
|
|
|
|
* @see #convertPoint
|
|
|
|
*/
|
|
|
|
public static MouseEvent convertMouseEvent(Component source,
|
|
|
|
MouseEvent sourceEvent,
|
|
|
|
Component destination)
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
{
|
2004-02-04 20:43:32 +00:00
|
|
|
Point newpt = convertPoint(source, sourceEvent.getX(), sourceEvent.getY(),
|
|
|
|
destination);
|
|
|
|
|
|
|
|
return new MouseEvent(destination, sourceEvent.getID(),
|
|
|
|
sourceEvent.getWhen(), sourceEvent.getModifiers(),
|
|
|
|
newpt.x, newpt.y, sourceEvent.getClickCount(),
|
|
|
|
sourceEvent.isPopupTrigger(), sourceEvent.getButton());
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
/**
|
|
|
|
* Recursively walk the component tree under <code>comp</code> calling
|
|
|
|
* <code>updateUI</code> on each {@link JComponent} found. This causes
|
|
|
|
* the entire tree to re-initialize its UI delegates.
|
|
|
|
*
|
|
|
|
* @param comp The component to walk the children of, calling <code>updateUI</code>
|
|
|
|
*/
|
|
|
|
public static void updateComponentTreeUI(Component comp)
|
|
|
|
{
|
|
|
|
if (comp == null)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (comp instanceof Container)
|
|
|
|
{
|
|
|
|
Component[] children = ((Container)comp).getComponents();
|
|
|
|
for (int i = 0; i < children.length; ++i)
|
|
|
|
updateComponentTreeUI(children[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (comp instanceof JComponent)
|
|
|
|
((JComponent)comp).updateUI();
|
|
|
|
}
|
|
|
|
|
2004-02-12 00:17:26 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
/**
|
|
|
|
* <p>Layout a "compound label" consisting of a text string and an icon
|
|
|
|
* which is to be placed near the rendered text. Once the text and icon
|
|
|
|
* are laid out, the text rectangle and icon rectangle parameters are
|
|
|
|
* altered to store the calculated positions.</p>
|
|
|
|
*
|
|
|
|
* <p>The size of the text is calculated from the provided font metrics
|
|
|
|
* object. This object should be the metrics of the font you intend to
|
|
|
|
* paint the label with.</p>
|
|
|
|
*
|
|
|
|
* <p>The position values control where the text is placed relative to
|
|
|
|
* the icon. The horizontal position value should be one of the constants
|
2004-02-12 00:17:26 +00:00
|
|
|
* <code>LEADING</code>, <code>TRAILING</code>, <code>LEFT</code>,
|
|
|
|
* <code>RIGHT</code> or <code>CENTER</code>. The vertical position value
|
|
|
|
* should be one fo the constants <code>TOP</code>, <code>BOTTOM</code>
|
|
|
|
* or <code>CENTER</code>.</p>
|
2004-02-04 20:43:32 +00:00
|
|
|
*
|
|
|
|
* <p>The text-icon gap value controls the number of pixels between the
|
|
|
|
* icon and the text.</p>
|
|
|
|
*
|
|
|
|
* <p>The alignment values control where the text and icon are placed, as
|
|
|
|
* a combined unit, within the view rectangle. The horizontal alignment
|
|
|
|
* value should be one of the constants <code>LEADING</code>,
|
|
|
|
* <code>TRAILING</code>, <code>LEFT</code>, <code>RIGHT</code> or
|
|
|
|
* <code>CENTER</code>. The vertical alignment valus should be one of the
|
|
|
|
* constants <code>TOP</code>, <code>BOTTOM</code> or
|
|
|
|
* <code>CENTER</code>.</p>
|
|
|
|
*
|
|
|
|
* <p>If the <code>LEADING</code> or <code>TRAILING</code> constants are
|
2004-02-12 00:17:26 +00:00
|
|
|
* given for horizontal alignment or horizontal text position, they are
|
|
|
|
* interpreted relative to the provided component's orientation property,
|
|
|
|
* a constant in the {@link java.awt.ComponentOrientation} class. For
|
|
|
|
* example, if the component's orientation is <code>LEFT_TO_RIGHT</code>,
|
|
|
|
* then the <code>LEADING</code> value is a synonym for <code>LEFT</code>
|
|
|
|
* and the <code>TRAILING</code> value is a synonym for
|
2004-02-04 20:43:32 +00:00
|
|
|
* <code>RIGHT</code></p>
|
|
|
|
*
|
|
|
|
* <p>If the text and icon are equal to or larger than the view
|
|
|
|
* rectangle, the horizontal and vertical alignment values have no
|
|
|
|
* affect.</p>
|
|
|
|
*
|
|
|
|
* @param c A component used for its orientation value
|
|
|
|
* @param fm The font metrics used to measure the text
|
|
|
|
* @param text The text to place in the compound label
|
|
|
|
* @param icon The icon to place next to the text
|
|
|
|
* @param verticalAlignment The vertical alignment of the label relative
|
|
|
|
* to its component
|
|
|
|
* @param horizontalAlignment The horizontal alignment of the label
|
|
|
|
* relative to its component
|
|
|
|
* @param verticalTextPosition The vertical position of the label's text
|
|
|
|
* relative to its icon
|
|
|
|
* @param horizontalTextPosition The horizontal position of the label's
|
|
|
|
* text relative to its icon
|
|
|
|
* @param viewR The view rectangle, specifying the area which layout is
|
|
|
|
* constrained to
|
|
|
|
* @param iconR A rectangle which is modified to hold the laid-out
|
|
|
|
* position of the icon
|
|
|
|
* @param textR A rectangle which is modified to hold the laid-out
|
|
|
|
* position of the text
|
|
|
|
* @param textIconGap The distance between text and icon
|
|
|
|
*
|
|
|
|
* @return The string of characters, possibly truncated with an elipsis,
|
|
|
|
* which is laid out in this label
|
|
|
|
*/
|
2004-02-12 00:17:26 +00:00
|
|
|
|
2003-06-19 16:30:09 +00:00
|
|
|
public static String layoutCompoundLabel(JComponent c,
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
FontMetrics fm,
|
2004-02-04 20:43:32 +00:00
|
|
|
String text,
|
|
|
|
Icon icon,
|
|
|
|
int verticalAlignment,
|
|
|
|
int horizontalAlignment,
|
|
|
|
int verticalTextPosition,
|
|
|
|
int horizontalTextPosition,
|
|
|
|
Rectangle viewR,
|
|
|
|
Rectangle iconR,
|
|
|
|
Rectangle textR,
|
|
|
|
int textIconGap)
|
|
|
|
{
|
|
|
|
|
2004-02-12 00:17:26 +00:00
|
|
|
// Fix up the orientation-based horizontal positions.
|
|
|
|
|
|
|
|
if (horizontalTextPosition == LEADING)
|
|
|
|
{
|
|
|
|
if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
|
|
|
|
horizontalTextPosition = RIGHT;
|
|
|
|
else
|
|
|
|
horizontalTextPosition = LEFT;
|
|
|
|
}
|
|
|
|
else if (horizontalTextPosition == TRAILING)
|
|
|
|
{
|
|
|
|
if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
|
|
|
|
horizontalTextPosition = LEFT;
|
|
|
|
else
|
|
|
|
horizontalTextPosition = RIGHT;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fix up the orientation-based alignments.
|
|
|
|
|
|
|
|
if (horizontalAlignment == LEADING)
|
|
|
|
{
|
|
|
|
if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
|
|
|
|
horizontalAlignment = RIGHT;
|
|
|
|
else
|
|
|
|
horizontalAlignment = LEFT;
|
|
|
|
}
|
|
|
|
else if (horizontalAlignment == TRAILING)
|
|
|
|
{
|
|
|
|
if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
|
|
|
|
horizontalAlignment = LEFT;
|
|
|
|
else
|
|
|
|
horizontalAlignment = RIGHT;
|
|
|
|
}
|
|
|
|
|
|
|
|
return layoutCompoundLabel(fm, text, icon,
|
|
|
|
verticalAlignment,
|
|
|
|
horizontalAlignment,
|
|
|
|
verticalTextPosition,
|
|
|
|
horizontalTextPosition,
|
|
|
|
viewR, iconR, textR, textIconGap);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* <p>Layout a "compound label" consisting of a text string and an icon
|
|
|
|
* which is to be placed near the rendered text. Once the text and icon
|
|
|
|
* are laid out, the text rectangle and icon rectangle parameters are
|
|
|
|
* altered to store the calculated positions.</p>
|
|
|
|
*
|
|
|
|
* <p>The size of the text is calculated from the provided font metrics
|
|
|
|
* object. This object should be the metrics of the font you intend to
|
|
|
|
* paint the label with.</p>
|
|
|
|
*
|
|
|
|
* <p>The position values control where the text is placed relative to
|
|
|
|
* the icon. The horizontal position value should be one of the constants
|
|
|
|
* <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>. The
|
|
|
|
* vertical position value should be one fo the constants
|
|
|
|
* <code>TOP</code>, <code>BOTTOM</code> or <code>CENTER</code>.</p>
|
|
|
|
*
|
|
|
|
* <p>The text-icon gap value controls the number of pixels between the
|
|
|
|
* icon and the text.</p>
|
|
|
|
*
|
|
|
|
* <p>The alignment values control where the text and icon are placed, as
|
|
|
|
* a combined unit, within the view rectangle. The horizontal alignment
|
|
|
|
* value should be one of the constants <code>LEFT</code>, <code>RIGHT</code> or
|
|
|
|
* <code>CENTER</code>. The vertical alignment valus should be one of the
|
|
|
|
* constants <code>TOP</code>, <code>BOTTOM</code> or
|
|
|
|
* <code>CENTER</code>.</p>
|
|
|
|
*
|
|
|
|
* <p>If the text and icon are equal to or larger than the view
|
|
|
|
* rectangle, the horizontal and vertical alignment values have no
|
|
|
|
* affect.</p>
|
|
|
|
*
|
|
|
|
* <p>Note that this method does <em>not</em> know how to deal with
|
|
|
|
* horizontal alignments or positions given as <code>LEADING</code> or
|
|
|
|
* <code>TRAILING</code> values. Use the other overloaded variant of this
|
|
|
|
* method if you wish to use such values.
|
|
|
|
*
|
|
|
|
* @param fm The font metrics used to measure the text
|
|
|
|
* @param text The text to place in the compound label
|
|
|
|
* @param icon The icon to place next to the text
|
|
|
|
* @param verticalAlignment The vertical alignment of the label relative
|
|
|
|
* to its component
|
|
|
|
* @param horizontalAlignment The horizontal alignment of the label
|
|
|
|
* relative to its component
|
|
|
|
* @param verticalTextPosition The vertical position of the label's text
|
|
|
|
* relative to its icon
|
|
|
|
* @param horizontalTextPosition The horizontal position of the label's
|
|
|
|
* text relative to its icon
|
|
|
|
* @param viewR The view rectangle, specifying the area which layout is
|
|
|
|
* constrained to
|
|
|
|
* @param iconR A rectangle which is modified to hold the laid-out
|
|
|
|
* position of the icon
|
|
|
|
* @param textR A rectangle which is modified to hold the laid-out
|
|
|
|
* position of the text
|
|
|
|
* @param textIconGap The distance between text and icon
|
|
|
|
*
|
|
|
|
* @return The string of characters, possibly truncated with an elipsis,
|
|
|
|
* which is laid out in this label
|
|
|
|
*/
|
|
|
|
|
|
|
|
public static String layoutCompoundLabel(FontMetrics fm,
|
|
|
|
String text,
|
|
|
|
Icon icon,
|
|
|
|
int verticalAlignment,
|
|
|
|
int horizontalAlignment,
|
|
|
|
int verticalTextPosition,
|
|
|
|
int horizontalTextPosition,
|
|
|
|
Rectangle viewR,
|
|
|
|
Rectangle iconR,
|
|
|
|
Rectangle textR,
|
|
|
|
int textIconGap)
|
|
|
|
{
|
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
// Work out basic height and width.
|
|
|
|
|
|
|
|
if (icon == null)
|
|
|
|
{
|
|
|
|
textIconGap = 0;
|
|
|
|
iconR.width = 0;
|
|
|
|
iconR.height = 0;
|
|
|
|
}
|
2004-02-12 00:17:26 +00:00
|
|
|
else
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
{
|
2004-02-04 20:43:32 +00:00
|
|
|
iconR.width = icon.getIconWidth();
|
[multiple changes]
2004-03-12 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes.
* javax/swing/JComponent.java (paint): Use persistent double buffer.
* javax/swing/JList.java (ListListener): Revalidate on changes.
* javax/swing/JScrollPane.java: Reimplement.
* javax/swing/JViewport.java: Reimplement.
* javax/swing/ScrollPaneLayout.java: Reimplement.
* javax/swing/ViewportLayout.java: Tidy up.
* javax/swing/plaf/basic/BasicButtonListener.java: Remove printlns.
* javax/swing/plaf/basic/BasicScrollPaneUI.java: Reimplement.
* javax/swing/plaf/basic/BasicSliderUI.java: Handle missing labels.
* javax/swing/plaf/basic/BasicViewportUI.java: Implement in terms of
backing store only.
2004-03-11 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_wm_protocols_filter): New function.
(window_focus_in_cb): Remove function.
(window_focus_out_cb): Likewise.
(window_focus_or_active_state_change_cb): New function.
(create): Add filter that removes WM_TAKE_FOCUS client messages.
(connectSignals): Don't attach handlers to focus-in-event or
focus-out-event signals. Handle notify signal.
2004-03-11 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetLabel): New native method declaration.
(setLabel): Use gtkSetLabel.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel): New method.
2004-03-10 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Default to
black when color argument is null.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: Remove check
for drag events.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild):
Remove candidate clip. Use the component
clip to intersect.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Use the PaintEvent's clip.
2004-03-10 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Don't set the clip for the
Graphics object.
2004-03-09 Graydon Hoare <graydon@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
Fix double <-> fixed macros, reset font transform.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
Likewise.
2004-03-09�� Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild): Move
the x and y coordinate of the component rectangle
to correct position.
(handleEvent): Forward drag events to the pressed
component.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Fix comments.
(ArrowButtonListener::mousePressed): Stop the
existing timer.
(mouseDragged): Implement.
(TrackListener::mousePressed): Only react if
the press doesn't occur on the thumb, otherwise
just set the offset.
(TrackListener::mouseReleased): Unset the isAdjusting
value.
(createIncreaseIcon): Switch icon.
(createDecreaseIcon): Switch icon.
(calculatePreferredSize): Use width.
(getThumbBounds): Use the top as the lower value.
(layoutVScrollBar): Switch the button locations.
(paintIncreaseHighlight): Paint correct side of thumb.
(paintDecreaseHighlight): ditto.
(valueForYPosition): Use top as the lower value.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix comments.
(mouseDragged): Implement.
(mousePressed): Only react when the thumb isn't
pressed, otherwise just set offset.
(mouseReleased): Handle a release of the thumb.
(scrollDueToClickInTrack): Stop the timer first.
* javax/swing/JProgressBar.java:
(setString): Fix change condition.
* javax/swing/JSeparator.java:
Remove println's.
2004-03-08 David Jee <djee@redhat.com>
* java/awt/image/AffineTransformOp.java:
(filter): Use Graphics2D interface instead of directly using the
GdkGraphics2D peer.
2004-03-05 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkButtonPeer.java
(handleEvent): Action events are generated upon MOUSE_RELEASED.
* java/awt/Container.java
(acquireComponentForMouseEvent): Fixed.
(handleEvent): Fixed.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(state_to_awt_mods_with_button_states): New method.
(pre_event_handler): Fixed mouse event generation.
2004-03-05 Olga Rodimina <rodimina@redhat.com>
gnu/java/awt/peer/gtk/GdkGraphics2D.java
(GdkGraphics2D (BufferedImage)): Initialize
pixmap associated with specified BufferedImage.
(setPaint): Changed implementation of Texture
Paint to use AffineTransformOp.
* java/awt/image/AffineTransformOp.java
(createCompatibleDestRaster): Throw RasterFormatException
if resulting width or height of raster is 0.
2004-03-04 Olga Rodimina <rodimina@redhat.com>
* java/awt/image/AffineTransformOp.java:
Removed unnecessary field interpolationType.
Formatted some of the lines to be consistent with
the GNU style.
(AffineTransformOp): Create new RenderingHints
containing specified interpolation type.
(createCompatibleDestImage): Implemented.
(createCompatibleDestRaster): Implemented.
(filter): Implemented.
(getBounds2D(BufferedImage)): Implemented.
(getBounds2D(Raster)): Implemented.
(getInterpolationType): Get interpolation value from
rendering hints.
2004-03-04 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): Check if child peers are null.
2004-03-04 Graydon Hoare <graydon@redhat.com>
* testsuite/lib/libjava.exp (libjava_find_lib): Don't include
.libs in -L option.
(libjava_arguments): Add new libraries to argument list.
2004-03-04 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_LTLIBRARIES): Added lib-java-awt.la,
lib-javax-swing.la, lib-java-applet.la, lib-java-beans.la.
(misc_java_source_files): New macro.
(swing_java_source_files): Likewise.
(awt_java_source_files): Pruned.
(applet_java_source_files): New macro.
(beans_java_source_files): Likewise.
(lib_java_applet_la_SOURCES): Likewise.
(lib_java_awt_la_SOURCES): Likewise.
(lib_javax_swing_la_SOURCES): Likewise.
(lib_java_beans_la_SOURCES): Likewise.
(all_java_object_files): Likewise.
(%.lo: %.java): Use all_java_object_files.
(all_java_source_files): Added new _SOURCES.
(ordinary_java_source_files): Removed awt_java_source_files.
2004-03-02 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added java/awt/image/AffineTransformOp.java
* Makefile.in: Re-generated.
* java/awt/image/AffineTransformOp.java: New Class.
2004-03-01 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(setPaint): Interpret correctly TexturePaint's
anchor rectangle.
(drawImage): Fixed scale factors of the affine
transform.
2004-02-27 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(GdkGraphics(Component)): Inherit font from component.
(drawString): Use font style.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetFont): New native method declaration.
(setFont): New method.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(gtkSetFont): New native method declaration.
(setFont): Call new native method gtkSetFont.
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): For all child components who do not their fonts set,
set their peers' fonts with this container's font.
* gnu/java/awt/peer/gtk/GtkLabelPeer.java:
Move all native method declarations to the top for readability.
(gtkSetFont): New native method declaration.
(setFont): New method.
* java/awt/Component.java
(setFont): Invalidate after setting the font.
* java/awt/Container.java
(invalidateTree): New method.
(setFont): Invalidate the container tree after setting the font.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString): Use font style.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
(Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont): New method.
2004-02-27 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(updateBufferedImage): New helper function.
Updates BufferedImage in memory if it was changed.
(draw): changed to update BufferedImage in memory after
this drawing operation
(fill): Ditto.
(draw3DRect): Ditto.
(fill3DRect): Ditto.
(clearRect): Ditto.
(drawRaster): Ditto.
(drawImage) : Ditto. Update only in case of GtkOffScreenImage with
no affine transformation.
(drawGlyphVector): Ditto.
2004-02-26 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(isBufferedImageGraphics): New Helper function.
Returns true if this graphics2d can be used to draw
into buffered image and false otherwise.
(updateImagePixels): New Helper function.
Updates pixels in the BufferedImage.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
(getImagePixels): New function. Returns pixels
of the buffered image associated with
this Graphics2D.
2004-02-26 David Jee <djee@redhat.com>
* java/awt/BorderLayout.java
(layoutContainer): Fix width and height calculations to ensure
that they're non-negative.
* java/awt/Component.java
(setBackground): If c is null, inherit from closest ancestor whose
background color is set.
2004-02-26�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Add new files.
* Makefile.in: Re-generate.
* javax/swing/JProgressBar.java:
(JProgressBar(int, int int)): Throw
IllegalArgumentException if orientation is
invalid.
(JProgressBar(BoundedRangeModel)): Create
ChangeListener and register it. UpdateUI.
(getChangeListeners): Implement.
(setModel): Reset ChangeListener.
* javax/swing/JScrollBar.java: Implement.
* javax/swing/JSeparator.java: Implement.
* javax/swing/JSlider.java:
(JSlider(int, int, int, int)): Throw
IllegalArgumentException if orientation
is invalid.
(getChangeListeners): Fix method name.
* javax/swing/SwingUtilities.java:
(layoutCompoundLabel): If there is no text,
set the text rectangle dimensions to 0.
* javax/swing/plaf/basic/BasicButtonUI.java:
(paint): If there is no text, don't paint it.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Implement.
* javax/swing/plaf/basic/BasicSeparatorUI.java:
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java:
(propertyChange): If the model changes, change
the listeners accordingly.
2004-02-25 Graydon Hoare <graydon@redhat.com>
* javax/swing/AbstractButton.java: Add "final" qualifiers.
* javax/swing/JList.java: Reimplement.
* javax/swing/DefaultListSelectionModel.java: Reimplement.
* javax/swing/plaf/basic/BasicListUI.java: Reimplement.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add "purple" values.
* javax/swing/ListModel.java: Javadoc.
* javax/swing/ListSelectionModel.java: Add missing methods.
* javax/swing/AbstractListModel.java: Javadoc and corrections.
* javax/swing/DefaultListModel.java: Javadoc and corrections.
* javax/swing/ListModel.java: Javadoc and corrections.
* javax/swing/DefaultListCellRenderer.java: Minor tidying.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer): Change default size to 12.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer): Change default size to 12.
(getClasspathFontPeer): Likewise. Set default name to "Default".
* java/awt/Font.java
(Font(Map)): Call Font(String,Map).
(Font(String,Map)): If attrs is null, initialize it as an empty
HashMap, which will ensure that the Font will get default attributes.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer(String,int)): Call the new constructor with size 1.
(GtkFontPeer(String,int,int)): New constructor with size attribute.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer(String,int)): Call the new overload method with size 1.
(getFontPeer(String,int,int)): New method. Overloaded with size
attribute.
(getClasspathFontPeer): Set the size of the font.
2004-02-24 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(bimage): New field.
(GdkGraphics2D): New Constructor. Constructs Graphics
object that can be used to draw into the Buffered Image.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
(GdkGraphicsEnvironment): Fixed to include public
keyword.
(createGraphics): Implemented.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getLocalGraphicsEnvironment): Implemented.
* java/awt/GraphicsEnvironment.java:
(getLocalGraphicsEnvironment): Implemented.
* java/awt/image/BufferedImage.java:
(createGraphics): Implemented.
2004-02-24 David Jee <djee@redhat.com>
* java/awt/Component.java
(eventTypeEnabled): Add MOUSE_MOVED and MOUSE_DRAGGED event types.
* java/awt/Container.java
(addNotifyContainerChildren): Fix event enabling.
2004-02-23 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added
gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
* Makefile.in: Re-generated.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
New Class.
2004-02-19 Kim Ho <kho@redhat.com>
* Makefile.am: Add BasicProgressBarUI
* Makefile.in: Regenerate.
* javax/swing/JProgressBar.java:
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java
Add constants for JProgressBar.
* javax/swing/plaf/basic/BasicProgressBarUI.java
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java
Change comments.
(calculateGeometry): New method
(paint): Remove unnecessary size calculations.
2004-02-18 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(drawRaster): Fixed small error that caused
imageToUser transformation to be set incorrectly.
(toString): Implemented.
2004-02-18 David Jee <djee@redhat.com>
* java/awt/CardLayout.java
(addLayoutComponent): Show the first component added as the default.
(removeLayoutComponent): After removing, show the next component.
(gotoComponent): If there is only one component, show it and return.
2004-02-18 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Re-order
modifiers.
* javax/swing/JLabel.java: Re-order
modifiers.
* javax/swing/JComponent.java:
(addPropertyChangeListener):
Implement.
(removePropertyChangeListener):
ditto.
(firePropertyChangeEvent):
ditto.
2004-02-17 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch ComponentEvent via system event queue.
(hide): Likewise.
(move): Likewise.
(resize): Likewise.
(reshape): Likewise.
* java/awt/Window.java
(setBoundsCallback): Likewise.
2004-02-17 David Jee <djee@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds):
Use gtk_widget_set_size_request() instead of the deprecated
gtk_widget_set_usize().
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Fix comments and
make property strings constants.
(createStandardLabels): Use the labels
preferred size as bounds.
* javax/swing/plaf/basic/BasicSliderUI.java
Fix comments.
(ScrollHandler::actionPerformed): Don't
calculate the timer stop value. Let the
MouseListeners find the stop location.
(getPreferredHorizontalSize): Re-implement.
(getPreferredVerticalSize): ditto.
(getMinimumHorizontalSize): ditto.
(getMinimumVerticalSize): ditto.
(getPreferredSize): ditto.
(getMinimumSize): ditto.
(getMaximumSize): ditto.
(paintTicks): Use doubles to find the
tick location.
(paintHorizontalLabel):�� Use preferredSize
as initial width and height.
(paintVerticalLabel): ditto.
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Changed
property strings to constants.
(DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY):
New property.
(setText): Change mnemonic index if
text is too short.
(setDisplayedMnemonicIndex): Fire property
change event.
(getDisplayedMnemonicIndex): Remove check
against short text.
2004-02-17 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(drawImage(img,xform,obs)): Invert xform before
passing the xform to cairo.
(drawImage(img,x,y,bgcolor,obs)): Implemented.
(drawImage (img,x,y,w,h,bgcolor,obs)): Partly
implemented.
(drawImage (img,x,y,w,h,obs)): Implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,
bgcolor,obs)): Partly implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,obs)):
Implemented.
* java/awt/image/BufferedImage.java:
(copyData): if dest is null, create raster with same
dimensions as the current image.
2004-02-16 Graydon Hoare <graydon@redhat.com>
* javax/swing/plaf/basic/BasicLabelUI.java
(getPreferredSize): Use layoutCL.
* javax/swing/plaf/basic/BasicGraphicsUtils.java
(getPreferredButtonSize): Start with empty view rect, layout using
component's preferred alignment.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add some Label and
List defaults.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch COMPONENT_SHOWN ComponentEvent.
(hide): Dispatch COMPONENT_HIDDEN ComponentEvent.
(move): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_MOVED ComponentEvent.
(resize): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_RESIZED ComponentEvent.
(reshape): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
* java/awt/Window.java
(setBoundsCallback): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
2004-02-16 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(setRenderingHint): Added implementation of
Interpolation rendering hints.
(setRenderingHints): Ditto.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
(drawPixels): fixed to allow user to choose type
of filtering that should be used when displaying images.
(cairoSurfaceSetFilter): New method. Sets filter type for
interpolation of pixel values.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(calcCellSizes): Rows or columns with zero sizes should still be
considered for extra space distribution.
2004-02-16 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Re-implement.
* javax/swing/plaf/basic/BasicLabelUI.java
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Added constant.
2004-02-16�� Kim Ho�� <kho@redhat.com>
* javax/swing/JSlider.java: Fix indentation and comments.
(setModel): Remove null check to conform with Sun's.
(setOrientation): Throw exception if not
HORIZONTAL or VERTICAL.
(getInverted): Use private variable instead of
ComponentOrientation.
(setInverted): ditto.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix indentation and comments.
(propertyChange): Remove check for inverted slider, handle
in main paint.
(getMinimumSize): Return preferred size.
(getMaximumSize): ditto.
(calculateFocusRect): Don't relocate rectangle.
(drawInverted): Return XOR of the slider's inversion and
the component's orientation.
(paint): Update leftToRightCache
2004-02-13 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(GetLayoutInfo): Fix weight and size distribution. Relocate repeated
code to helper methods.
(sortBySpan): New helper method.
(distributeSizeAndWeight): Likewise.
(calcCellWeights): Likewise.
(calcCellSizes): Add comments.
2004-02-13 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Only do something if component is invisible at the moment.
(hide): Only do something if component is visible at the moment.
(reshape): If lightweight, erase old bounds and repaint new bounds.
2004-02-13�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Updated for new file.
* Makefile.in: Regenerated.
* javax/swing/JSlider.java: Reimplement.
* javax/swing/SwingUtilities.java
(layoutCompoundLabel): Use icon height
instead of width.
(paintComponent): Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Add JSlider defaults.
* javax/swing/plaf/basic/BasicSliderUI.java:
Implement. New file.
From-SVN: r79607
2004-03-17 21:29:02 +00:00
|
|
|
iconR.height = icon.getIconHeight();
|
|
|
|
}
|
|
|
|
if (text == null)
|
|
|
|
{
|
|
|
|
textIconGap = 0;
|
|
|
|
textR.width = 0;
|
|
|
|
textR.height = 0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
textR.width = fm.stringWidth(text);
|
|
|
|
textR.height = fm.getHeight();
|
2004-02-04 20:43:32 +00:00
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
// Work out the position of text and icon, assuming the top-left coord
|
|
|
|
// starts at (0,0). We will fix that up momentarily, after these
|
|
|
|
// "position" decisions are made and we look at alignment.
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
switch (horizontalTextPosition)
|
|
|
|
{
|
|
|
|
case LEFT:
|
|
|
|
textR.x = 0;
|
|
|
|
iconR.x = textR.width + textIconGap;
|
|
|
|
break;
|
|
|
|
case RIGHT:
|
|
|
|
iconR.x = 0;
|
|
|
|
textR.x = iconR.width + textIconGap;
|
|
|
|
break;
|
|
|
|
case CENTER:
|
|
|
|
int centerLine = Math.max(textR.width, iconR.width) / 2;
|
|
|
|
textR.x = centerLine - textR.width/2;
|
|
|
|
iconR.x = centerLine - iconR.width/2;
|
|
|
|
break;
|
MemoryImageSource.java, [...]: New versions from classpath.
2003-07-14 Michael Koch <konqueror@gmx.de>
* java/awt/image/MemoryImageSource.java,
java/beans/PropertyEditorManager.java,
javax/naming/CompoundName.java,
javax/naming/spi/NamingManager.java,
javax/swing/AbstractButton.java,
javax/swing/ButtonModel.java,
javax/swing/SwingUtilities.java,
javax/swing/UIManager.java,
javax/swing/colorchooser/DefaultColorSelectionModel.java,
javax/swing/event/AncestorEvent.java,
javax/swing/event/InternalFrameEvent.java,
java/util/zip/ZipFile.java:
New versions from classpath.
From-SVN: r69321
2003-07-14 05:33:30 +00:00
|
|
|
}
|
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
switch (verticalTextPosition)
|
|
|
|
{
|
|
|
|
case TOP:
|
|
|
|
textR.y = 0;
|
|
|
|
iconR.y = textR.height + textIconGap;
|
|
|
|
break;
|
|
|
|
case BOTTOM:
|
|
|
|
iconR.y = 0;
|
|
|
|
textR.y = iconR.height + textIconGap;
|
|
|
|
break;
|
|
|
|
case CENTER:
|
|
|
|
int centerLine = Math.max(textR.height, iconR.height) / 2;
|
|
|
|
textR.y = centerLine - textR.height/2;
|
|
|
|
iconR.y = centerLine - iconR.height/2;
|
|
|
|
break;
|
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
// The two rectangles are laid out correctly now, but only assuming
|
|
|
|
// that their upper left corner is at (0,0). If we have any alignment other
|
|
|
|
// than TOP and LEFT, we need to adjust them.
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
Rectangle u = textR.union(iconR);
|
|
|
|
int horizontalAdjustment = viewR.x;
|
|
|
|
int verticalAdjustment = viewR.y;
|
|
|
|
switch (verticalAlignment)
|
|
|
|
{
|
|
|
|
case TOP:
|
|
|
|
break;
|
|
|
|
case BOTTOM:
|
|
|
|
verticalAdjustment += (viewR.height - u.height);
|
|
|
|
break;
|
|
|
|
case CENTER:
|
|
|
|
verticalAdjustment += ((viewR.height/2) - (u.height/2));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
switch (horizontalAlignment)
|
|
|
|
{
|
|
|
|
case LEFT:
|
|
|
|
break;
|
|
|
|
case RIGHT:
|
|
|
|
horizontalAdjustment += (viewR.width - u.width);
|
|
|
|
break;
|
|
|
|
case CENTER:
|
|
|
|
horizontalAdjustment += ((viewR.width/2) - (u.width/2));
|
|
|
|
break;
|
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
iconR.x += horizontalAdjustment;
|
|
|
|
iconR.y += verticalAdjustment;
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
textR.x += horizontalAdjustment;
|
|
|
|
textR.y += verticalAdjustment;
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
return text;
|
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
/**
|
|
|
|
* Calls {@link java.awt.EventQueue.invokeLater} with the
|
|
|
|
* specified {@link Runnable}.
|
|
|
|
*/
|
|
|
|
public static void invokeLater(Runnable doRun)
|
|
|
|
{
|
|
|
|
java.awt.EventQueue.invokeLater(doRun);
|
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
/**
|
|
|
|
* Calls {@link java.awt.EventQueue.invokeAndWait} with the
|
|
|
|
* specified {@link Runnable}.
|
|
|
|
*/
|
|
|
|
public static void invokeAndWait(Runnable doRun)
|
|
|
|
throws InterruptedException,
|
|
|
|
InvocationTargetException
|
|
|
|
{
|
|
|
|
java.awt.EventQueue.invokeAndWait(doRun);
|
|
|
|
}
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
/**
|
|
|
|
* Calls {@link java.awt.EventQueue.isEventDispatchThread}.
|
|
|
|
*/
|
|
|
|
public static boolean isEventDispatchThread()
|
|
|
|
{
|
|
|
|
return java.awt.EventQueue.isDispatchThread();
|
|
|
|
}
|
[multiple changes]
2004-03-12 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes.
* javax/swing/JComponent.java (paint): Use persistent double buffer.
* javax/swing/JList.java (ListListener): Revalidate on changes.
* javax/swing/JScrollPane.java: Reimplement.
* javax/swing/JViewport.java: Reimplement.
* javax/swing/ScrollPaneLayout.java: Reimplement.
* javax/swing/ViewportLayout.java: Tidy up.
* javax/swing/plaf/basic/BasicButtonListener.java: Remove printlns.
* javax/swing/plaf/basic/BasicScrollPaneUI.java: Reimplement.
* javax/swing/plaf/basic/BasicSliderUI.java: Handle missing labels.
* javax/swing/plaf/basic/BasicViewportUI.java: Implement in terms of
backing store only.
2004-03-11 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_wm_protocols_filter): New function.
(window_focus_in_cb): Remove function.
(window_focus_out_cb): Likewise.
(window_focus_or_active_state_change_cb): New function.
(create): Add filter that removes WM_TAKE_FOCUS client messages.
(connectSignals): Don't attach handlers to focus-in-event or
focus-out-event signals. Handle notify signal.
2004-03-11 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetLabel): New native method declaration.
(setLabel): Use gtkSetLabel.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel): New method.
2004-03-10 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Default to
black when color argument is null.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: Remove check
for drag events.
2004-03-10 Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild):
Remove candidate clip. Use the component
clip to intersect.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Use the PaintEvent's clip.
2004-03-10 Kim Ho <kho@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
(handleEvent): Don't set the clip for the
Graphics object.
2004-03-09 Graydon Hoare <graydon@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
Fix double <-> fixed macros, reset font transform.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
Likewise.
2004-03-09�� Kim Ho <kho@redhat.com>
* java/awt/Container.java: (visitChild): Move
the x and y coordinate of the component rectangle
to correct position.
(handleEvent): Forward drag events to the pressed
component.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Fix comments.
(ArrowButtonListener::mousePressed): Stop the
existing timer.
(mouseDragged): Implement.
(TrackListener::mousePressed): Only react if
the press doesn't occur on the thumb, otherwise
just set the offset.
(TrackListener::mouseReleased): Unset the isAdjusting
value.
(createIncreaseIcon): Switch icon.
(createDecreaseIcon): Switch icon.
(calculatePreferredSize): Use width.
(getThumbBounds): Use the top as the lower value.
(layoutVScrollBar): Switch the button locations.
(paintIncreaseHighlight): Paint correct side of thumb.
(paintDecreaseHighlight): ditto.
(valueForYPosition): Use top as the lower value.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix comments.
(mouseDragged): Implement.
(mousePressed): Only react when the thumb isn't
pressed, otherwise just set offset.
(mouseReleased): Handle a release of the thumb.
(scrollDueToClickInTrack): Stop the timer first.
* javax/swing/JProgressBar.java:
(setString): Fix change condition.
* javax/swing/JSeparator.java:
Remove println's.
2004-03-08 David Jee <djee@redhat.com>
* java/awt/image/AffineTransformOp.java:
(filter): Use Graphics2D interface instead of directly using the
GdkGraphics2D peer.
2004-03-05 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkButtonPeer.java
(handleEvent): Action events are generated upon MOUSE_RELEASED.
* java/awt/Container.java
(acquireComponentForMouseEvent): Fixed.
(handleEvent): Fixed.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(state_to_awt_mods_with_button_states): New method.
(pre_event_handler): Fixed mouse event generation.
2004-03-05 Olga Rodimina <rodimina@redhat.com>
gnu/java/awt/peer/gtk/GdkGraphics2D.java
(GdkGraphics2D (BufferedImage)): Initialize
pixmap associated with specified BufferedImage.
(setPaint): Changed implementation of Texture
Paint to use AffineTransformOp.
* java/awt/image/AffineTransformOp.java
(createCompatibleDestRaster): Throw RasterFormatException
if resulting width or height of raster is 0.
2004-03-04 Olga Rodimina <rodimina@redhat.com>
* java/awt/image/AffineTransformOp.java:
Removed unnecessary field interpolationType.
Formatted some of the lines to be consistent with
the GNU style.
(AffineTransformOp): Create new RenderingHints
containing specified interpolation type.
(createCompatibleDestImage): Implemented.
(createCompatibleDestRaster): Implemented.
(filter): Implemented.
(getBounds2D(BufferedImage)): Implemented.
(getBounds2D(Raster)): Implemented.
(getInterpolationType): Get interpolation value from
rendering hints.
2004-03-04 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): Check if child peers are null.
2004-03-04 Graydon Hoare <graydon@redhat.com>
* testsuite/lib/libjava.exp (libjava_find_lib): Don't include
.libs in -L option.
(libjava_arguments): Add new libraries to argument list.
2004-03-04 Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (toolexeclib_LTLIBRARIES): Added lib-java-awt.la,
lib-javax-swing.la, lib-java-applet.la, lib-java-beans.la.
(misc_java_source_files): New macro.
(swing_java_source_files): Likewise.
(awt_java_source_files): Pruned.
(applet_java_source_files): New macro.
(beans_java_source_files): Likewise.
(lib_java_applet_la_SOURCES): Likewise.
(lib_java_awt_la_SOURCES): Likewise.
(lib_javax_swing_la_SOURCES): Likewise.
(lib_java_beans_la_SOURCES): Likewise.
(all_java_object_files): Likewise.
(%.lo: %.java): Use all_java_object_files.
(all_java_source_files): Added new _SOURCES.
(ordinary_java_source_files): Removed awt_java_source_files.
2004-03-02 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added java/awt/image/AffineTransformOp.java
* Makefile.in: Re-generated.
* java/awt/image/AffineTransformOp.java: New Class.
2004-03-01 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(setPaint): Interpret correctly TexturePaint's
anchor rectangle.
(drawImage): Fixed scale factors of the affine
transform.
2004-02-27 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics.java
(GdkGraphics(Component)): Inherit font from component.
(drawString): Use font style.
* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
(gtkSetFont): New native method declaration.
(setFont): New method.
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(gtkSetFont): New native method declaration.
(setFont): Call new native method gtkSetFont.
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(setFont): For all child components who do not their fonts set,
set their peers' fonts with this container's font.
* gnu/java/awt/peer/gtk/GtkLabelPeer.java:
Move all native method declarations to the top for readability.
(gtkSetFont): New native method declaration.
(setFont): New method.
* java/awt/Component.java
(setFont): Invalidate after setting the font.
* java/awt/Container.java
(invalidateTree): New method.
(setFont): Invalidate the container tree after setting the font.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString): Use font style.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont): New method.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
(Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont): New method.
2004-02-27 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(updateBufferedImage): New helper function.
Updates BufferedImage in memory if it was changed.
(draw): changed to update BufferedImage in memory after
this drawing operation
(fill): Ditto.
(draw3DRect): Ditto.
(fill3DRect): Ditto.
(clearRect): Ditto.
(drawRaster): Ditto.
(drawImage) : Ditto. Update only in case of GtkOffScreenImage with
no affine transformation.
(drawGlyphVector): Ditto.
2004-02-26 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(isBufferedImageGraphics): New Helper function.
Returns true if this graphics2d can be used to draw
into buffered image and false otherwise.
(updateImagePixels): New Helper function.
Updates pixels in the BufferedImage.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
(getImagePixels): New function. Returns pixels
of the buffered image associated with
this Graphics2D.
2004-02-26 David Jee <djee@redhat.com>
* java/awt/BorderLayout.java
(layoutContainer): Fix width and height calculations to ensure
that they're non-negative.
* java/awt/Component.java
(setBackground): If c is null, inherit from closest ancestor whose
background color is set.
2004-02-26�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Add new files.
* Makefile.in: Re-generate.
* javax/swing/JProgressBar.java:
(JProgressBar(int, int int)): Throw
IllegalArgumentException if orientation is
invalid.
(JProgressBar(BoundedRangeModel)): Create
ChangeListener and register it. UpdateUI.
(getChangeListeners): Implement.
(setModel): Reset ChangeListener.
* javax/swing/JScrollBar.java: Implement.
* javax/swing/JSeparator.java: Implement.
* javax/swing/JSlider.java:
(JSlider(int, int, int, int)): Throw
IllegalArgumentException if orientation
is invalid.
(getChangeListeners): Fix method name.
* javax/swing/SwingUtilities.java:
(layoutCompoundLabel): If there is no text,
set the text rectangle dimensions to 0.
* javax/swing/plaf/basic/BasicButtonUI.java:
(paint): If there is no text, don't paint it.
* javax/swing/plaf/basic/BasicScrollBarUI.java:
Implement.
* javax/swing/plaf/basic/BasicSeparatorUI.java:
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java:
(propertyChange): If the model changes, change
the listeners accordingly.
2004-02-25 Graydon Hoare <graydon@redhat.com>
* javax/swing/AbstractButton.java: Add "final" qualifiers.
* javax/swing/JList.java: Reimplement.
* javax/swing/DefaultListSelectionModel.java: Reimplement.
* javax/swing/plaf/basic/BasicListUI.java: Reimplement.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add "purple" values.
* javax/swing/ListModel.java: Javadoc.
* javax/swing/ListSelectionModel.java: Add missing methods.
* javax/swing/AbstractListModel.java: Javadoc and corrections.
* javax/swing/DefaultListModel.java: Javadoc and corrections.
* javax/swing/ListModel.java: Javadoc and corrections.
* javax/swing/DefaultListCellRenderer.java: Minor tidying.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer): Change default size to 12.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer): Change default size to 12.
(getClasspathFontPeer): Likewise. Set default name to "Default".
* java/awt/Font.java
(Font(Map)): Call Font(String,Map).
(Font(String,Map)): If attrs is null, initialize it as an empty
HashMap, which will ensure that the Font will get default attributes.
2004-02-25 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkFontPeer.java
(GtkFontPeer(String,int)): Call the new constructor with size 1.
(GtkFontPeer(String,int,int)): New constructor with size attribute.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getFontPeer(String,int)): Call the new overload method with size 1.
(getFontPeer(String,int,int)): New method. Overloaded with size
attribute.
(getClasspathFontPeer): Set the size of the font.
2004-02-24 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(bimage): New field.
(GdkGraphics2D): New Constructor. Constructs Graphics
object that can be used to draw into the Buffered Image.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
(GdkGraphicsEnvironment): Fixed to include public
keyword.
(createGraphics): Implemented.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(getLocalGraphicsEnvironment): Implemented.
* java/awt/GraphicsEnvironment.java:
(getLocalGraphicsEnvironment): Implemented.
* java/awt/image/BufferedImage.java:
(createGraphics): Implemented.
2004-02-24 David Jee <djee@redhat.com>
* java/awt/Component.java
(eventTypeEnabled): Add MOUSE_MOVED and MOUSE_DRAGGED event types.
* java/awt/Container.java
(addNotifyContainerChildren): Fix event enabling.
2004-02-23 Olga Rodimina <rodimina@redhat.com>
* Makefile.am: Added
gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
* Makefile.in: Re-generated.
* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
New Class.
2004-02-19 Kim Ho <kho@redhat.com>
* Makefile.am: Add BasicProgressBarUI
* Makefile.in: Regenerate.
* javax/swing/JProgressBar.java:
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java
Add constants for JProgressBar.
* javax/swing/plaf/basic/BasicProgressBarUI.java
Implement.
* javax/swing/plaf/basic/BasicSliderUI.java
Change comments.
(calculateGeometry): New method
(paint): Remove unnecessary size calculations.
2004-02-18 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(drawRaster): Fixed small error that caused
imageToUser transformation to be set incorrectly.
(toString): Implemented.
2004-02-18 David Jee <djee@redhat.com>
* java/awt/CardLayout.java
(addLayoutComponent): Show the first component added as the default.
(removeLayoutComponent): After removing, show the next component.
(gotoComponent): If there is only one component, show it and return.
2004-02-18 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Re-order
modifiers.
* javax/swing/JLabel.java: Re-order
modifiers.
* javax/swing/JComponent.java:
(addPropertyChangeListener):
Implement.
(removePropertyChangeListener):
ditto.
(firePropertyChangeEvent):
ditto.
2004-02-17 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch ComponentEvent via system event queue.
(hide): Likewise.
(move): Likewise.
(resize): Likewise.
(reshape): Likewise.
* java/awt/Window.java
(setBoundsCallback): Likewise.
2004-02-17 David Jee <djee@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds):
Use gtk_widget_set_size_request() instead of the deprecated
gtk_widget_set_usize().
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JSlider.java: Fix comments and
make property strings constants.
(createStandardLabels): Use the labels
preferred size as bounds.
* javax/swing/plaf/basic/BasicSliderUI.java
Fix comments.
(ScrollHandler::actionPerformed): Don't
calculate the timer stop value. Let the
MouseListeners find the stop location.
(getPreferredHorizontalSize): Re-implement.
(getPreferredVerticalSize): ditto.
(getMinimumHorizontalSize): ditto.
(getMinimumVerticalSize): ditto.
(getPreferredSize): ditto.
(getMinimumSize): ditto.
(getMaximumSize): ditto.
(paintTicks): Use doubles to find the
tick location.
(paintHorizontalLabel):�� Use preferredSize
as initial width and height.
(paintVerticalLabel): ditto.
2004-02-17 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Changed
property strings to constants.
(DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY):
New property.
(setText): Change mnemonic index if
text is too short.
(setDisplayedMnemonicIndex): Fire property
change event.
(getDisplayedMnemonicIndex): Remove check
against short text.
2004-02-17 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(drawImage(img,xform,obs)): Invert xform before
passing the xform to cairo.
(drawImage(img,x,y,bgcolor,obs)): Implemented.
(drawImage (img,x,y,w,h,bgcolor,obs)): Partly
implemented.
(drawImage (img,x,y,w,h,obs)): Implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,
bgcolor,obs)): Partly implemented.
(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,obs)):
Implemented.
* java/awt/image/BufferedImage.java:
(copyData): if dest is null, create raster with same
dimensions as the current image.
2004-02-16 Graydon Hoare <graydon@redhat.com>
* javax/swing/plaf/basic/BasicLabelUI.java
(getPreferredSize): Use layoutCL.
* javax/swing/plaf/basic/BasicGraphicsUtils.java
(getPreferredButtonSize): Start with empty view rect, layout using
component's preferred alignment.
* javax/swing/plaf/basic/BasicLookAndFeel.java: Add some Label and
List defaults.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Dispatch COMPONENT_SHOWN ComponentEvent.
(hide): Dispatch COMPONENT_HIDDEN ComponentEvent.
(move): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_MOVED ComponentEvent.
(resize): Erase old bounds and repaint new bounds. Dispatch
COMPONENT_RESIZED ComponentEvent.
(reshape): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
* java/awt/Window.java
(setBoundsCallback): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
ComponentEvents.
2004-02-16 Olga Rodimina <rodimina@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
(setRenderingHint): Added implementation of
Interpolation rendering hints.
(setRenderingHints): Ditto.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
(drawPixels): fixed to allow user to choose type
of filtering that should be used when displaying images.
(cairoSurfaceSetFilter): New method. Sets filter type for
interpolation of pixel values.
2004-02-16 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(calcCellSizes): Rows or columns with zero sizes should still be
considered for extra space distribution.
2004-02-16 Kim Ho <kho@redhat.com>
* javax/swing/JLabel.java: Re-implement.
* javax/swing/plaf/basic/BasicLabelUI.java
Re-implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Added constant.
2004-02-16�� Kim Ho�� <kho@redhat.com>
* javax/swing/JSlider.java: Fix indentation and comments.
(setModel): Remove null check to conform with Sun's.
(setOrientation): Throw exception if not
HORIZONTAL or VERTICAL.
(getInverted): Use private variable instead of
ComponentOrientation.
(setInverted): ditto.
* javax/swing/plaf/basic/BasicSliderUI.java:
Fix indentation and comments.
(propertyChange): Remove check for inverted slider, handle
in main paint.
(getMinimumSize): Return preferred size.
(getMaximumSize): ditto.
(calculateFocusRect): Don't relocate rectangle.
(drawInverted): Return XOR of the slider's inversion and
the component's orientation.
(paint): Update leftToRightCache
2004-02-13 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(GetLayoutInfo): Fix weight and size distribution. Relocate repeated
code to helper methods.
(sortBySpan): New helper method.
(distributeSizeAndWeight): Likewise.
(calcCellWeights): Likewise.
(calcCellSizes): Add comments.
2004-02-13 David Jee <djee@redhat.com>
* java/awt/Component.java
(show): Only do something if component is invisible at the moment.
(hide): Only do something if component is visible at the moment.
(reshape): If lightweight, erase old bounds and repaint new bounds.
2004-02-13�� Kim Ho�� <kho@redhat.com>
* Makefile.am: Updated for new file.
* Makefile.in: Regenerated.
* javax/swing/JSlider.java: Reimplement.
* javax/swing/SwingUtilities.java
(layoutCompoundLabel): Use icon height
instead of width.
(paintComponent): Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Add JSlider defaults.
* javax/swing/plaf/basic/BasicSliderUI.java:
Implement. New file.
From-SVN: r79607
2004-03-17 21:29:02 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* This method paints the given component at the given position and size.
|
|
|
|
* The component will be reparented to the container given.
|
|
|
|
*
|
|
|
|
* @param g The Graphics object to draw with.
|
|
|
|
* @param c The Component to draw
|
|
|
|
* @param p The Container to reparent to.
|
|
|
|
* @param x The x coordinate to draw at.
|
|
|
|
* @param y The y coordinate to draw at.
|
|
|
|
* @param w The width of the drawing area.
|
|
|
|
* @param h The height of the drawing area.
|
|
|
|
*/
|
|
|
|
public static void paintComponent(Graphics g, Component c, Container p,
|
|
|
|
int x, int y, int w, int h)
|
|
|
|
{
|
|
|
|
Container parent = c.getParent();
|
|
|
|
if (parent != null)
|
|
|
|
parent.remove(c);
|
|
|
|
if (p != null)
|
|
|
|
p.add(c);
|
|
|
|
|
|
|
|
Shape savedClip = g.getClip();
|
|
|
|
|
|
|
|
g.setClip(x, y, w, h);
|
|
|
|
g.translate(x, y);
|
|
|
|
|
|
|
|
c.paint(g);
|
|
|
|
|
|
|
|
g.translate(-x, -y);
|
|
|
|
g.setClip(savedClip);
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* This method paints the given component in the given rectangle.
|
|
|
|
* The component will be reparented to the container given.
|
|
|
|
*
|
|
|
|
* @param g The Graphics object to draw with.
|
|
|
|
* @param c The Component to draw
|
|
|
|
* @param p The Container to reparent to.
|
|
|
|
* @param r The rectangle that describes the drawing area.
|
|
|
|
*/
|
|
|
|
public static void paintComponent(Graphics g, Component c,
|
|
|
|
Container p, Rectangle r)
|
|
|
|
{
|
|
|
|
paintComponent(g, c, p, r.x, r.y, r.width, r.height);
|
|
|
|
}
|
|
|
|
|
2002-08-09 04:26:17 +00:00
|
|
|
|
2004-02-04 20:43:32 +00:00
|
|
|
}
|