Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Furnadjiev2017-02-06 11:57:15 +0000
committerIvan Furnadjiev2017-02-06 11:57:15 +0000
commit91164b3e6213c23c7abade8b5073d881cd83d713 (patch)
tree5f2f851459f50ed47590e89f5501a84a34720feb
parent6e6587a7d5ea5a20c9dd569778eb1d72307b76c9 (diff)
downloadorg.eclipse.rap-91164b3e6213c23c7abade8b5073d881cd83d713.tar.gz
org.eclipse.rap-91164b3e6213c23c7abade8b5073d881cd83d713.tar.xz
org.eclipse.rap-91164b3e6213c23c7abade8b5073d881cd83d713.zip
Ensure that the Tree/Table custom variant is applied to the grid lines
-rw-r--r--bundles/org.eclipse.rap.rwt/js/rwt/widgets/Grid.js2
-rw-r--r--bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/tablekit/Table.appearances.js6
-rw-r--r--bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/treekit/Tree.appearances.js6
3 files changed, 10 insertions, 4 deletions
diff --git a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Grid.js b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Grid.js
index 17e297cdee..161450f034 100644
--- a/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Grid.js
+++ b/bundles/org.eclipse.rap.rwt/js/rwt/widgets/Grid.js
@@ -372,6 +372,7 @@ rwt.qx.Class.define( "rwt.widgets.Grid", {
if( state.slice( 0, 8 ) === "variant_" ) {
this._config.variant = state;
this._rootItem.setVariant( state );
+ this._rowContainer.updateGridLines();
this._scheduleColumnUpdate();
}
},
@@ -380,6 +381,7 @@ rwt.qx.Class.define( "rwt.widgets.Grid", {
if( this._config.variant === state ) {
this._config.variant = null;
this._rootItem.setVariant( null );
+ this._rowContainer.updateGridLines();
this._scheduleColumnUpdate();
}
this.base( arguments, state );
diff --git a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/tablekit/Table.appearances.js b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/tablekit/Table.appearances.js
index 090e9b301f..2898ea0c09 100644
--- a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/tablekit/Table.appearances.js
+++ b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/tablekit/Table.appearances.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2015 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2007, 2017 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
@@ -45,7 +45,9 @@ var appearances = {
var borderWidths = [ 0, 0, 0, 0 ];
var borderStyles = [ "solid", "solid", "solid", "solid" ];
if( !states.dummy ) {
- var gridLineStates = { "vertical" : true, "header" : true };
+ var gridLineStates = rwt.util.Objects.copy( states );
+ gridLineStates[ "vertical" ] = true;
+ gridLineStates[ "header" ] = true;
var tvGrid = new rwt.theme.ThemeValues( gridLineStates );
var gridColor = tvGrid.getCssColor( "Table-GridLine", "color" );
gridColor = gridColor == "undefined" ? "transparent" : gridColor;
diff --git a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/treekit/Tree.appearances.js b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/treekit/Tree.appearances.js
index 314622e232..18c6300ede 100644
--- a/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/treekit/Tree.appearances.js
+++ b/bundles/org.eclipse.rap.rwt/widgetkits/org/eclipse/swt/internal/widgets/treekit/Tree.appearances.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2015 Innoopract Informationssysteme GmbH and others.
+ * Copyright (c) 2007, 2017 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
@@ -95,7 +95,9 @@ var appearances = {
var borderWidths = [ 0, 0, 0, 0 ];
var borderStyles = [ "solid", "solid", "solid", "solid" ];
if( !states.dummy && !states.footer ) {
- var gridLineStates = { "vertical" : true, "header" : true };
+ var gridLineStates = rwt.util.Objects.copy( states );
+ gridLineStates[ "vertical" ] = true;
+ gridLineStates[ "header" ] = true;
var tvGrid = new rwt.theme.ThemeValues( gridLineStates );
var gridColor = tvGrid.getCssColor( "Tree-GridLine", "color" );
gridColor = gridColor == "undefined" ? "transparent" : gridColor;

Back to the top