[Hipgmap-cvs] gmap/com/trileet/gmap ImageCache.java,1.14,1.15 MapWindow.java,1.17,1.18 SearchWindow.java,1.18,1.19

[Karl G. <kg...@us...>]

Update of /cvsroot/hipgmap/gmap/com/trileet/gmap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19934/com/trileet/gmap

Modified Files:
	ImageCache.java MapWindow.java SearchWindow.java 
Log Message:


moved back button function from eventDown to eventUp, so that keylock works
correctly



Index: MapWindow.java
===================================================================
RCS file: /cvsroot/hipgmap/gmap/com/trileet/gmap/MapWindow.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** MapWindow.java	10 Apr 2005 20:45:33 -0000	1.17
--- MapWindow.java	20 Apr 2005 14:14:20 -0000	1.18
***************
*** 81,84 ****
--- 81,88 ----
  			m_tileSet.zoomIn();
  		} 
+ 		else if (widget == Event.DEVICE_BUTTON_BACK
+ 			 || widget == Event.DEVICE_BUTTON_CANCEL){ //kgutwin -- allow keylock
+ 			GMap.showSearchWindow();
+ 		}
  		else {
  			return super.eventWidgetUp(widget, event);
***************
*** 131,137 ****
  			m_tileSet.toggleDisplay();
  		}
- 		else if (widget == Event.DEVICE_BUTTON_BACK){
- 			GMap.showSearchWindow();
- 		}
  		
  		else {
--- 135,138 ----

Index: ImageCache.java
===================================================================
RCS file: /cvsroot/hipgmap/gmap/com/trileet/gmap/ImageCache.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ImageCache.java	10 Apr 2005 23:16:04 -0000	1.14
--- ImageCache.java	20 Apr 2005 14:14:19 -0000	1.15
***************
*** 4,7 ****
--- 4,8 ----
  import danger.ui.Bitmap;
  import danger.ui.ImageCodec;
+ import danger.ui.Color;
  import danger.app.Application;
  import danger.app.DataStore;
***************
*** 509,513 ****
  						try {
  							image = Bitmap.newFromEncodedData(bytes);
! 							//image = Bitmap.convertToScreenColorSpace(image);
  						} catch (Throwable t) {
  							System.out.println("Unable to decode image: " + url + " error: "
--- 510,514 ----
  						try {
  							image = Bitmap.newFromEncodedData(bytes);
! 							image = Bitmap.convertToScreenColorSpace(image,Color.BLACK);
  						} catch (Throwable t) {
  							System.out.println("Unable to decode image: " + url + " error: "

Index: SearchWindow.java
===================================================================
RCS file: /cvsroot/hipgmap/gmap/com/trileet/gmap/SearchWindow.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SearchWindow.java	10 Apr 2005 20:45:33 -0000	1.18
--- SearchWindow.java	20 Apr 2005 14:14:20 -0000	1.19
***************
*** 246,250 ****
  	 * Called when buttons are pressed, on BACK, return to the launcher like a good app should.
  	 */
! 	public boolean eventWidgetDown(int widget, Event event) {
  		// If this is back or cancel, back out
  		if (widget == Event.DEVICE_BUTTON_BACK
--- 246,251 ----
  	 * Called when buttons are pressed, on BACK, return to the launcher like a good app should.
  	 */
! 
! 	public boolean eventWidgetUp(int widget, Event event) {
  		// If this is back or cancel, back out
  		if (widget == Event.DEVICE_BUTTON_BACK
***************
*** 254,258 ****
  		}
  
! 		return super.eventWidgetDown(widget, event);
  	}
      public boolean eventWidgetHeld(int widget, Event event) {
--- 255,259 ----
  		}
  
! 		return super.eventWidgetUp(widget, event);
  	}
      public boolean eventWidgetHeld(int widget, Event event) {