Attachment #110940 for bug #244004

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.





  construct : function() {
    this.base( arguments );
    this.rap_init();    
  },

  members : {
    rap_init : function() {
      this._userCursor = null;
      this.addEventListener( "changeFont", this._rwt_onChangeFont, this );
      this.addEventListener( "changeTextColor", this._rwt_onChangeTextColor, this );
      this.addEventListener( "changeBackgroundColor", this._rwt_onChangeBackgoundColor, this );
      this.addEventListener( "changeValue", this._rwt_onChangeValue, this );
      this.addEventListener( "changeEditable", this._rwt_onChangeEditable, this );
      this._popup.addEventListener( "appear", this._rwt_onPopupAppear, this );
      this._popup.addEventListener( "disappear", this._rwt_onPopupDisappear, this );
    },

      this.removeEventListener( "changeTextColor", this._rwt_onChangeTextColor, this );
      this.removeEventListener( "changeBackgroundColor", this._rwt_onChangeBackgoundColor, this );
      this.removeEventListener( "changeValue", this._rwt_onChangeValue, this );
      this.removeEventListener( "changeEditable", this._rwt_onChangeEditable, this );
      this._popup.removeEventListener( "appear", this._rwt_onPopupAppear, this );
      this._popup.removeEventListener( "disappear", this._rwt_onPopupDisappear, this );
    },

    _rwt_onPopupAppear : function( evt ) {
      var f = this.getField();
      f.setReadOnly( true );
      if( this._userCursor == null ) {
        f.setCursor( "default" );
      }
      f.setSelectable( false );
    },


      var editable = this.getEditable();
      var f = this.getField();
      f.setReadOnly( !editable );
      if( this._userCursor == null ) {
        f.setCursor( editable ? null : "default" );
      }
      f.setSelectable( editable );
    },
    
    _rwt_onChangeEditable : function( evt ) {
      if( this._userCursor != null ) {
        this.getField().setCursor( this._userCursor );
      }  
    },  
    
    setCursor : function( value ) {
      this._userCursor = value;
      this.getField().setCursor( value );
      this.getButton().setCursor( value );
      this.getList().setCursor( value );
    }

  }

Lines 764-769 Link Here

(-)js/org/eclipse/swt/theme/AppearancesBase.js (-1 / +2 lines)
764	style : function( states ) {	764	style : function( states ) {
765	var tv = new org.eclipse.swt.theme.ThemeValues( states );	765	var tv = new org.eclipse.swt.theme.ThemeValues( states );
766	return {	766	return {
		767	cursor : "default",
767	overflow : "hidden",	768	overflow : "hidden",
768	textColor : tv.getColor( "list.foreground" ),	769	textColor : tv.getColor( "list.foreground" ),
769	backgroundColor : tv.getColor( "list.background" ),	770	backgroundColor : tv.getColor( "list.background" ),
Lines 777-783 Link Here
777	style : function( states ) {	778	style : function( states ) {
778	var tv = new org.eclipse.swt.theme.ThemeValues( states );	779	var tv = new org.eclipse.swt.theme.ThemeValues( states );
779	var result = {	780	var result = {
780	cursor : "default",	781	// cursor : "default",
781	height : "auto",	782	height : "auto",
782	horizontalChildrenAlign : "left",	783	horizontalChildrenAlign : "left",
783	verticalChildrenAlign : "middle",	784	verticalChildrenAlign : "middle",

Return to bug 244004

Lines 17-31 Link Here

(-)js/org/eclipse/swt/widgets/Combo.js (-4 / +24 lines)
17		17
18	construct : function() {	18	construct : function() {
19	this.base( arguments );	19	this.base( arguments );
20	this.rap_init();	20	this.rap_init();
21	},	21	},
22		22
23	members : {	23	members : {
24	rap_init : function() {	24	rap_init : function() {
		25	this._userCursor = null;
25	this.addEventListener( "changeFont", this._rwt_onChangeFont, this );	26	this.addEventListener( "changeFont", this._rwt_onChangeFont, this );
26	this.addEventListener( "changeTextColor", this._rwt_onChangeTextColor, this );	27	this.addEventListener( "changeTextColor", this._rwt_onChangeTextColor, this );
27	this.addEventListener( "changeBackgroundColor", this._rwt_onChangeBackgoundColor, this );	28	this.addEventListener( "changeBackgroundColor", this._rwt_onChangeBackgoundColor, this );
28	this.addEventListener( "changeValue", this._rwt_onChangeValue, this );	29	this.addEventListener( "changeValue", this._rwt_onChangeValue, this );
		30	this.addEventListener( "changeEditable", this._rwt_onChangeEditable, this );
29	this._popup.addEventListener( "appear", this._rwt_onPopupAppear, this );	31	this._popup.addEventListener( "appear", this._rwt_onPopupAppear, this );
30	this._popup.addEventListener( "disappear", this._rwt_onPopupDisappear, this );	32	this._popup.addEventListener( "disappear", this._rwt_onPopupDisappear, this );
31	},	33	},
Lines 35-40 Link Here
35	this.removeEventListener( "changeTextColor", this._rwt_onChangeTextColor, this );	37	this.removeEventListener( "changeTextColor", this._rwt_onChangeTextColor, this );
36	this.removeEventListener( "changeBackgroundColor", this._rwt_onChangeBackgoundColor, this );	38	this.removeEventListener( "changeBackgroundColor", this._rwt_onChangeBackgoundColor, this );
37	this.removeEventListener( "changeValue", this._rwt_onChangeValue, this );	39	this.removeEventListener( "changeValue", this._rwt_onChangeValue, this );
		40	this.removeEventListener( "changeEditable", this._rwt_onChangeEditable, this );
38	this._popup.removeEventListener( "appear", this._rwt_onPopupAppear, this );	41	this._popup.removeEventListener( "appear", this._rwt_onPopupAppear, this );
39	this._popup.removeEventListener( "disappear", this._rwt_onPopupDisappear, this );	42	this._popup.removeEventListener( "disappear", this._rwt_onPopupDisappear, this );
40	},	43	},
Lines 118-124 Link Here
118	_rwt_onPopupAppear : function( evt ) {	121	_rwt_onPopupAppear : function( evt ) {
119	var f = this.getField();	122	var f = this.getField();
120	f.setReadOnly( true );	123	f.setReadOnly( true );
121	f.setCursor( "default" );	124	if( this._userCursor == null ) {
		125	f.setCursor( "default" );
		126	}
122	f.setSelectable( false );	127	f.setSelectable( false );
123	},	128	},
124		129
Lines 127-134 Link Here
127	var editable = this.getEditable();	132	var editable = this.getEditable();
128	var f = this.getField();	133	var f = this.getField();
129	f.setReadOnly( !editable );	134	f.setReadOnly( !editable );
130	f.setCursor( editable ? null : "default" );	135	if( this._userCursor == null ) {
		136	f.setCursor( editable ? null : "default" );
		137	}
131	f.setSelectable( editable );	138	f.setSelectable( editable );
		139	},
		140
		141	_rwt_onChangeEditable : function( evt ) {
		142	if( this._userCursor != null ) {
		143	this.getField().setCursor( this._userCursor );
		144	}
		145	},
		146
		147	setCursor : function( value ) {
		148	this._userCursor = value;
		149	this.getField().setCursor( value );
		150	this.getButton().setCursor( value );
		151	this.getList().setCursor( value );
132	}	152	}
133		153
134	}	154	}