mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 17:00:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

IntegerGraphicsState.java (getClip): Clone clip before returning, handle null clip.

Browse Source 
2006-02-23  Scott Gilbertson  <scottg@mantatest.com>

	* gnu/awt/j2d/IntegerGraphicsState.java (getClip): Clone clip
	before returning, handle null clip.
	(getClipBounds): Handle null clip.
	* gnu/awt/j2d/Graphics2DImpl.java (clipRect): Handle null clip.
	* gnu/awt/xlib/XCanvasPeer.java (): 
	(getLocationOnScreen): Implement.
	* classpath/gnu/java/awt/peer/GLightweightPeer.java
	(repaint): Merged with Classpath.
	* classpath/java/awt/Graphics.java (hitClip): Merged with
	Classpath.

From-SVN: r111395
This commit is contained in:
Scott Gilbertson 2006-02-23 20:50:49 +00:00 committed by Scott Gilbertson
parent 072b06f2dc
commit cbb5e20166
6 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libjava/ChangeLog
View File

@ -1,3 +1,16 @@
2006-02-23 Scott Gilbertson <scottg@mantatest.com>
* gnu/awt/j2d/IntegerGraphicsState.java (getClip): Clone clip
before returning, handle null clip.
(getClipBounds): Handle null clip.
* gnu/awt/j2d/Graphics2DImpl.java (clipRect): Handle null clip.
* gnu/awt/xlib/XCanvasPeer.java ():
(getLocationOnScreen): Implement.
* classpath/gnu/java/awt/peer/GLightweightPeer.java
(repaint): Merged with Classpath.
* classpath/java/awt/Graphics.java (hitClip): Merged with
Classpath.
2006-02-21 Robert Schuster <robertschuster@fsfe.org>
* link.cc: Added variant of create_error_method that

7
libjava/classpath/gnu/java/awt/peer/GLightweightPeer.java
View File

@ -227,7 +227,12 @@ public class GLightweightPeer
public void print(Graphics graphics) {}
public void repaint(long tm, int x, int y, int width, int height) {}
public void repaint(long tm, int x, int y, int width, int height)
{
Component p = comp.getParent ();
if(p != null)
p.repaint(tm,x+comp.getX(),y+comp.getY(),width,height);
}
public void requestFocus() {}

3
libjava/classpath/java/awt/Graphics.java
View File

@ -617,6 +617,9 @@ public abstract class Graphics
*/
public boolean hitClip(int x, int y, int width, int height)
{
Shape clip = getClip();
if (clip == null)
return true;
return getClip().intersects(x, y, width, height);
}

6
libjava/gnu/awt/j2d/Graphics2DImpl.java
View File

@ -175,6 +175,12 @@ public class Graphics2DImpl extends Graphics2D implements Cloneable
public void clipRect(int x, int y, int width, int height)
{
Shape clip = state.getClip();
if (clip == null)
{
clip = new Rectangle (x,y,width,height);
setClip (clip);
return;
}
if (clip instanceof Rectangle)
{
Rectangle clipRect = (Rectangle) clip;

6
libjava/gnu/awt/j2d/IntegerGraphicsState.java
View File

@ -132,9 +132,11 @@ public class IntegerGraphicsState extends AbstractGraphicsState
public Shape getClip()
{
if (clip == null)
return null;
if (clip instanceof Rectangle)
{
Rectangle clipRect = (Rectangle) clip;
Rectangle clipRect = (Rectangle) ((Rectangle) clip).clone();
clipRect.x -= tx;
clipRect.y -= ty;
return clipRect;
@ -149,6 +151,8 @@ public class IntegerGraphicsState extends AbstractGraphicsState
public Rectangle getClipBounds()
{
if (clip == null)
return null;
Rectangle clipRect = clip.getBounds();
clipRect.x -= tx;

6
libjava/gnu/awt/xlib/XCanvasPeer.java
View File

@ -247,10 +247,12 @@ public class XCanvasPeer implements CanvasPeer
gfx2d.setColor(component.getBackground());
return gfx2d;
}
private Rectangle locationBounds;
public Point getLocationOnScreen()
{
throw new UnsupportedOperationException("FIXME, not implemented");
locationBounds = window.getBounds (locationBounds);
return new Point (locationBounds.x,locationBounds.y);
}
public Dimension getMinimumSize ()