Check-in [25a8f8aa02]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Corrections to EnforcedDrawingAreaGraphics.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:25a8f8aa02837933104842047b978fe2a7d8c422
User & Date: stephanie.gawroriski 2019-05-17 15:46:10
Context
2019-05-17
15:46
Draw command bar if there are commands. check-in: f4e7411c38 user: stephanie.gawroriski tags: trunk
15:46
Corrections to EnforcedDrawingAreaGraphics. check-in: 25a8f8aa02 user: stephanie.gawroriski tags: trunk
15:30
Some base work. check-in: 321a6b8100 user: stephanie.gawroriski tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to runt/apis/midp-lcdui/cc/squirreljme/runtime/lcdui/gfx/AdvancedGraphics.java.

269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
		int oldclipsx = this.clipsx,
			oldclipsy = this.clipsy,
			oldclipex = this.clipex,
			oldclipey = this.clipey;
		
		// Only set the clipping bounds if they exceed the previous ones
		if (__x > oldclipsx)
			this.clipsx = __x;
		if (__y > oldclipsy)
			this.clipsy = __y;
		if (ex < clipex)
			this.clipex = ex;
		if (ey < clipey)
			this.clipey = ey;
		
		// Set width/height
		this.clipw = ex - __x;
		this.cliph = ey - __y;
	}
	
	/**
	 * {@inheritDoc}
	 * @since 2019/03/24
	 */
	@Override







|

|
|
|
|
|


|
|







269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
		int oldclipsx = this.clipsx,
			oldclipsy = this.clipsy,
			oldclipex = this.clipex,
			oldclipey = this.clipey;
		
		// Only set the clipping bounds if they exceed the previous ones
		if (__x > oldclipsx)
			this.clipsx = (oldclipsx = __x);
		if (__y > oldclipsy)
			this.clipsy = (oldclipsy = __y);
		if (ex < oldclipex)
			this.clipex = (oldclipex = ex);
		if (ey < oldclipey)
			this.clipey = (oldclipey = ey);
		
		// Set width/height
		this.clipw = clipex - oldclipsx;
		this.cliph = clipey - oldclipsy;
	}
	
	/**
	 * {@inheritDoc}
	 * @since 2019/03/24
	 */
	@Override

Changes to runt/apis/midp-lcdui/cc/squirreljme/runtime/lcdui/gfx/EnforcedDrawingAreaGraphics.java.

686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
		// Our viewing area
		int x = this.x,
			y = this.y,
			width = this.width,
			height = this.height;
		
		// Set new clipping area
		g.clipRect(x, y, width, height);
		this._clipx = 0;
		this._clipy = 0;
		this._clipw = width;
		this._cliph = height;
		
		// Reset translation and draw position
		this._dx = x;







|







686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
		// Our viewing area
		int x = this.x,
			y = this.y,
			width = this.width,
			height = this.height;
		
		// Set new clipping area
		g.setClip(x, y, width, height);
		this._clipx = 0;
		this._clipy = 0;
		this._clipw = width;
		this._cliph = height;
		
		// Reset translation and draw position
		this._dx = x;

Changes to runt/apis/midp-lcdui/cc/squirreljme/runtime/lcdui/phoneui/ActiveDisplay.java.

143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
		// Otherwise, we draw the title bar and the command bar
		else
		{
			// Title bar is always drawn
			drawtitlebar = true;
			
			// The command bar is only drawn if we have actual commands
			drawcommandbar = (numcommands > 0);
			
			// Draw area is shortened in height
			uw = dw;
			uh = (dh - StandardMetrics.TITLE_BAR_HEIGHT) -
				(drawcommandbar ? StandardMetrics.COMMAND_BAR_HEIGHT : 0);
			
			// Use 







|







143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
		// Otherwise, we draw the title bar and the command bar
		else
		{
			// Title bar is always drawn
			drawtitlebar = true;
			
			// The command bar is only drawn if we have actual commands
			drawcommandbar = false;//(numcommands > 0);
			
			// Draw area is shortened in height
			uw = dw;
			uh = (dh - StandardMetrics.TITLE_BAR_HEIGHT) -
				(drawcommandbar ? StandardMetrics.COMMAND_BAR_HEIGHT : 0);
			
			// Use