FCL/sf/app/jrt: comparison javauis/lcdui_qt/src/javax/microedition/lcdui/Graphics.java

equal deleted inserted replaced

-:35baca0e7a2e
+:023eef975703
 // Set default sync strategy as closed
 private int syncStrategy = SYNC_LEAVE_SURFACE_SESSION_CLOSED;
 private DirectGraphics directGraphics;
 private Buffer graphicsBuffer;
-// Current font for rendering texts.
+// Cache for settings
+// these members have package visibility,
+// however they meant to be accessed only by
+// this (Graphics) instance or related (Buffer)
+// greaphicsBuffer instance
 Font currentFont;
 int currentColor;
 int translateX;
 int translateY;
 int[] currentClip = new int[4];
 int currentStrokeStyle;
 private com.nokia.mj.impl.rt.support.Finalizer finalizer;
 //Constructor
 Graphics(Buffer buffer, Rectangle clipRect)
 {
 });
 currentClip[0] = clipRect.x;
 currentClip[1] = clipRect.y;
 currentClip[2] = clipRect.width;
 currentClip[3] = clipRect.height;
+setDefaultSettings();
 graphicsBuffer = buffer;
-reset();
 }
 /**
 }
 }
 /**
 * Resets Graphics state to initial.
+* Reset does not set the clip.
 */
 void reset()
+{
+	synchronized(graphicsBuffer) {
+		// setDefaultSettings() must be called
+		// before the setGraphicsDefaults() since
+		// graphicsBuffer (Buffer implementation) uses
+		// the member values of this instance when setting the defaults
+		setDefaultSettings();
+		graphicsBuffer.setGraphicsDefaults(this);
+	}
+}
+void setDefaultSettings()
 {
 currentFont = Buffer.defaultFont;
 currentColor = Buffer.defaultColor;
 currentStrokeStyle = Buffer.defaultStrokeStyle;
 translateX = Buffer.defaultTranslateX;
 translateY = Buffer.defaultTranslateY;
 }
 /**
 * Cleans the Canvas background.
 */
 void cleanBackground(Rectangle area)
 {
 * This affects on the behavior of the sync method of this class
 * which is called via LCDUIInvoker
 */
 void setSyncStrategy(int strategy)
 {
-	if((strategy != SYNC_LEAVE_SURFACE_SESSION_CLOSED) && (strategy != SYNC_LEAVE_SURFACE_SESSION_OPEN))
+if((strategy != SYNC_LEAVE_SURFACE_SESSION_CLOSED) && (strategy != SYNC_LEAVE_SURFACE_SESSION_OPEN))
-	{
+{
-		throw new IllegalArgumentException("Internal: Invalid strategy value");
+throw new IllegalArgumentException("Internal: Invalid strategy value");
-	}
+}
-	syncStrategy = strategy;
+syncStrategy = strategy;
 }
 /**
 * Sets coordinate translation. Translations are cumulative.
 *
 */
 public int getRedComponent()
 {
 synchronized(graphicsBuffer)
 {
-return currentColor >> 16;
+return (currentColor >> 16) & COMPONENT_MASK;
 }
 }
 /**
 * Returns green component of current color.
 synchronized(image.graphicsBuffer)
 {
 final Image localLcduiImage = image;
 final org.eclipse.swt.internal.qt.graphics.Image localCgfxImage =
-	Internal_GfxPackageSupport.getImage(Image.getESWTImage(image));
+Internal_GfxPackageSupport.getImage(Image.getESWTImage(image));
 final int localX = x;
 final int localY = y;
 final Graphics self = this;
-ESWTUIThreadRunner.safeSyncExec(new Runnable()
+if(image.graphicsBuffer.containsDrawnPrimitives()) {
-			{
+localLcduiImage.sync(true);
-				public void run()
+}
-				{
+graphicsBuffer.drawImage(localCgfxImage, localX, localY, self);
-					localLcduiImage.sync(false);
-					graphicsBuffer.drawImage(localCgfxImage, localX, localY, self);
-				}
-			});
 }
 }
 }
 /**
 x = xDst - srcImage.getWidth();
 }
 final int gcTransform = Image.getCgTransformValue(transform);
 synchronized(srcImage.graphicsBuffer)
 {
-	final Image localLcduiSrcImage = srcImage;
+final Image localLcduiSrcImage = srcImage;
-	final org.eclipse.swt.internal.qt.graphics.Image localCgfxImage =
+final org.eclipse.swt.internal.qt.graphics.Image localCgfxImage =
-	Internal_GfxPackageSupport.getImage(Image.getESWTImage(srcImage));
+Internal_GfxPackageSupport.getImage(Image.getESWTImage(srcImage));
-	final int localX = x;
+final int localX = x;
-	final int localY = y;
+final int localY = y;
-	final int localW = width;
+final int localW = width;
-	final int localH = height;
+final int localH = height;
-	final int localXSrc = xSrc;
+final int localXSrc = xSrc;
-	final int localYSrc = ySrc;
+final int localYSrc = ySrc;
-	final int localGcTransform = gcTransform;
+final int localGcTransform = gcTransform;
-	final Graphics self = this;
+final Graphics self = this;
-	ESWTUIThreadRunner.safeSyncExec(new Runnable()
+if(srcImage.graphicsBuffer.containsDrawnPrimitives()) {
-{
+localLcduiSrcImage.sync(true);
-public void run()
+}
-{
+graphicsBuffer.drawImage(localCgfxImage,
-	localLcduiSrcImage.sync(false);
+localX, localY, localW, localH, localXSrc, localYSrc, localW, localH, localGcTransform, self);
-graphicsBuffer.drawImage(localCgfxImage,
-		localX, localY, localW, localH, localXSrc, localYSrc, localW, localH, localGcTransform, self);
-}
-});
 }
 }
 }
 /**
 * Performs synchronization on the graphics buffer, i.e.
 * the buffered draw commands are rasterized to the surface.
 */
 void sync()
 {
-	synchronized(graphicsBuffer)
+synchronized(graphicsBuffer)
-	{
+{
-		if(syncStrategy == SYNC_LEAVE_SURFACE_SESSION_OPEN)
+if(syncStrategy == SYNC_LEAVE_SURFACE_SESSION_OPEN)
-		{
+{
-			// This instance is used only with paint callbacks, thus
+// This instance is used only with paint callbacks, thus
-			// sync is called with the indication that surface paint
+// sync is called with the indication that surface paint
-			// session can be left open as it will be closed when the
+// session can be left open as it will be closed when the
-			// callback returns.
+// callback returns.
-		    graphicsBuffer.sync(false);
+graphicsBuffer.sync(false);
-		}
+}
-		else
+else
-		{
+{
-			graphicsBuffer.sync(true);
+graphicsBuffer.sync(true);
-		}
+}
-	}
+}
 }
 /**
 * Return DirectGraphics associated with this instance.
 }
 return directGraphics;
 }
 /**
-	 * Getter for graphics buffer.
+* Getter for graphics buffer.
-	 * @return The Buffer.
+* @return The Buffer.
-	 */
+*/
 Buffer getGraphicsBuffer()
 {
 return graphicsBuffer;
 }
 /**
 * Maps stroke style constant from values used by
 * Graphics to values defined in GraphicsContext
 */
 static int mapStrokeStyle(int strokeStyle)

changeset 50	023eef975703
parent 35	85266cc22c7f
child 56	abc41079b313