From c96076ef8bb2d9d9f27f0b44cb1743af0babab24 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Tue, 23 Aug 2011 13:02:17 +0000 Subject: Barebones fix for #6745: Connectors for Tree, i.e. ugly but works. We can make it more pretty in future releases if necessary. Includes TestBench test for the feature. svn changeset:20577/svn branch:6.7 --- .../themes/base/tree/img/connector-item-last.png | Bin 0 -> 148 bytes .../VAADIN/themes/base/tree/img/connector-item.png | Bin 0 -> 153 bytes WebContent/VAADIN/themes/base/tree/img/connector.png | Bin 0 -> 143 bytes WebContent/VAADIN/themes/base/tree/tree.css | 18 ++++++++++++++++-- WebContent/VAADIN/themes/reindeer/tree/tree.css | 9 +++++++++ .../runo/tree/img/connectors/collapsed-last.png | Bin 0 -> 218 bytes .../themes/runo/tree/img/connectors/collapsed.png | Bin 0 -> 242 bytes .../runo/tree/img/connectors/connector-item.png | Bin 0 -> 163 bytes .../themes/runo/tree/img/connectors/connector.png | Bin 0 -> 907 bytes .../themes/runo/tree/img/connectors/expanded-last.png | Bin 0 -> 226 bytes .../themes/runo/tree/img/connectors/expanded.png | Bin 0 -> 262 bytes 11 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 WebContent/VAADIN/themes/base/tree/img/connector-item-last.png create mode 100644 WebContent/VAADIN/themes/base/tree/img/connector-item.png create mode 100644 WebContent/VAADIN/themes/base/tree/img/connector.png create mode 100644 WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png create mode 100644 WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed.png create mode 100644 WebContent/VAADIN/themes/runo/tree/img/connectors/connector-item.png create mode 100644 WebContent/VAADIN/themes/runo/tree/img/connectors/connector.png create mode 100644 WebContent/VAADIN/themes/runo/tree/img/connectors/expanded-last.png create mode 100644 WebContent/VAADIN/themes/runo/tree/img/connectors/expanded.png (limited to 'WebContent') diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item-last.png b/WebContent/VAADIN/themes/base/tree/img/connector-item-last.png new file mode 100644 index 0000000000..2eb04a32fd Binary files /dev/null and b/WebContent/VAADIN/themes/base/tree/img/connector-item-last.png differ diff --git a/WebContent/VAADIN/themes/base/tree/img/connector-item.png b/WebContent/VAADIN/themes/base/tree/img/connector-item.png new file mode 100644 index 0000000000..5f88fe1bef Binary files /dev/null and b/WebContent/VAADIN/themes/base/tree/img/connector-item.png differ diff --git a/WebContent/VAADIN/themes/base/tree/img/connector.png b/WebContent/VAADIN/themes/base/tree/img/connector.png new file mode 100644 index 0000000000..2844bba731 Binary files /dev/null and b/WebContent/VAADIN/themes/base/tree/img/connector.png differ diff --git a/WebContent/VAADIN/themes/base/tree/tree.css b/WebContent/VAADIN/themes/base/tree/tree.css index 9e056dc4d6..593771a49c 100644 --- a/WebContent/VAADIN/themes/base/tree/tree.css +++ b/WebContent/VAADIN/themes/base/tree/tree.css @@ -11,10 +11,24 @@ .v-tree-node-caption:focus { outline: none; } +div.v-tree-node-leaf { + background: transparent; +} +.v-tree-connectors .v-tree-node-leaf, +.v-tree-connectors .v-tree-node-leaf:hover { + background: transparent url(img/connector-item.png) no-repeat 8px 0; +} +.v-tree-connectors .v-tree-node-leaf-last, +.v-tree-connectors .v-tree-node-leaf-last:hover { + background: transparent url(img/connector-item-last.png) no-repeat 8px 0; +} .v-tree-node-expanded { - background-position: -5px -10px; + background: transparent url(../common/img/sprites.png) no-repeat -5px -10px; } -div.v-tree-node-leaf { +.v-tree-connectors .v-tree-node-children { + background: transparent url(img/connector.png) repeat-y 8px bottom; +} +.v-tree-connectors .v-tree-node-children-last { background: transparent; } .v-tree-node-caption { diff --git a/WebContent/VAADIN/themes/reindeer/tree/tree.css b/WebContent/VAADIN/themes/reindeer/tree/tree.css index 3f77bd991d..d33985f713 100644 --- a/WebContent/VAADIN/themes/reindeer/tree/tree.css +++ b/WebContent/VAADIN/themes/reindeer/tree/tree.css @@ -11,6 +11,15 @@ .v-tree-node-expanded { background-position: -7px 5px; } +.v-tree-connectors .v-tree-node-leaf { + background-position: 8px -1px; +} +.v-ie6 .v-tree-connectors div.v-tree-node-leaf { + background: transparent url(../../base/tree/img/connector-item.png) no-repeat 8px -1px; +} +.v-ie6 .v-tree-connectors div.v-tree-node-leaf-last { + background: transparent url(../../base/tree/img/connector-item-last.png) no-repeat 8px -1px; +} .v-tree-node-caption { margin-left: 16px; padding-bottom: 1px; diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png new file mode 100644 index 0000000000..28b3626d79 Binary files /dev/null and b/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed-last.png differ diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed.png new file mode 100644 index 0000000000..db4d41cccd Binary files /dev/null and b/WebContent/VAADIN/themes/runo/tree/img/connectors/collapsed.png differ diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/connector-item.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/connector-item.png new file mode 100644 index 0000000000..b4d0d7aa56 Binary files /dev/null and b/WebContent/VAADIN/themes/runo/tree/img/connectors/connector-item.png differ diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/connector.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/connector.png new file mode 100644 index 0000000000..a93f458787 Binary files /dev/null and b/WebContent/VAADIN/themes/runo/tree/img/connectors/connector.png differ diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded-last.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded-last.png new file mode 100644 index 0000000000..504b715122 Binary files /dev/null and b/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded-last.png differ diff --git a/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded.png b/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded.png new file mode 100644 index 0000000000..5c036ed038 Binary files /dev/null and b/WebContent/VAADIN/themes/runo/tree/img/connectors/expanded.png differ -- cgit v1.2.3