Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.rap.rwt/js/rwt/remote/handler/GridColumnGroupHandler.js4
-rw-r--r--bundles/org.eclipse.rap.rwt/js/rwt/widgets/GridColumn.js11
-rw-r--r--bundles/org.eclipse.rap.rwt/js/rwt/widgets/base/GridHeader.js4
3 files changed, 15 insertions, 4 deletions
diff --git a/bundles/org.eclipse.rap.rwt/js/rwt/remote/handler/GridColumnGroupHandler.js b/bundles/org.eclipse.rap.rwt/js/rwt/remote/handler/GridColumnGroupHandler.js
index 63ee84cfa4..93b9712682 100644
--- a/bundles/org.eclipse.rap.rwt/js/rwt/remote/handler/GridColumnGroupHandler.js
+++ b/bundles/org.eclipse.rap.rwt/js/rwt/remote/handler/GridColumnGroupHandler.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2014 EclipseSource and others.
+ * Copyright (c) 2011, 2016 EclipseSource and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,8 +13,10 @@ rwt.remote.HandlerRegistry.add( "rwt.widgets.GridColumnGroup", {
factory : function( properties ) {
var result;
+ var styleMap = rwt.remote.HandlerUtil.createStyleMap( properties.style );
rwt.remote.HandlerUtil.callWithTarget( properties.parent, function( parent ) {
result = new rwt.widgets.GridColumn( parent, true );
+ result.setShowChevron( styleMap.TOGGLE === true );
rwt.remote.HandlerUtil.addDestroyableChild( parent, result );
} );
return result;
diff --git a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/GridColumn.js b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/GridColumn.js
index eff00c1d6e..e3c5b1dbaf 100644
--- a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/GridColumn.js
+++ b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/GridColumn.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2014 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2007, 2016 Innoopract Informationssysteme GmbH and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -41,6 +41,7 @@ rwt.qx.Class.define( "rwt.widgets.GridColumn", {
this._footerImage = null;
this._footerSpan = 1;
this._sortDirection = null;
+ this._showChevron = false;
this._check = false;
this._grid.addColumn( this );
},
@@ -307,6 +308,14 @@ rwt.qx.Class.define( "rwt.widgets.GridColumn", {
return this._isGroup;
},
+ setShowChevron : function( value ) {
+ this._showChevron = value;
+ },
+
+ getShowChevron : function() {
+ return this._showChevron;
+ },
+
_update : function() {
this.dispatchSimpleEvent( "update" );
},
diff --git a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/base/GridHeader.js b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/base/GridHeader.js
index 9c2aee2122..23cb797c90 100644
--- a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/base/GridHeader.js
+++ b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/base/GridHeader.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2015 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2011, 2016 Innoopract Informationssysteme GmbH and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -138,7 +138,7 @@ rwt.qx.Class.define( "rwt.widgets.base.GridHeader", {
label.setImage( column.getImage() );
label.setToolTipText( column.getToolTipText() );
label.setSortIndicator( column.getSortDirection() );
- if( column.isGroup() ) {
+ if( column.isGroup() && column.getShowChevron() ) {
label.setChevron( column.isExpanded() ? "expanded" : "collapsed" );
}
this._renderLabelY( label, column );

Back to the top