From c28458996bf4a327f1284a7df69c296ad51a3585 Mon Sep 17 00:00:00 2001 From: Jouni Koivuviita Date: Tue, 9 Oct 2007 12:59:20 +0000 Subject: [PATCH] -Style name convetion changes to IPanel (no longer multiple classname like ".i-panel .i-panel-light", just ".i-panel-light" and ".i-panel-light-caption"). -FilterSelect prev and next button structure changed (now has one extra SPAN element for styling). -Initial tree styling done. svn changeset:2472/svn branch:trunk --- .../terminal/gwt/client/ui/IFilterSelect.java | 12 ++--- .../terminal/gwt/client/ui/IPanel.java | 28 ++++------- .../toolkit/terminal/gwt/client/ui/ITree.java | 4 +- .../terminal/gwt/client/ui/TreeImages.java | 23 +++++++++ .../gwt/public/default/panel/panel.css | 45 ++++++------------ .../public/default/select/filterselect.css | 5 -- .../gwt/public/default/tree/img/collapsed.png | Bin 0 -> 3637 bytes .../gwt/public/default/tree/img/expanded.png | Bin 0 -> 3646 bytes .../terminal/gwt/public/default/tree/tree.css | 29 +++++++++-- src/com/itmill/toolkit/tests/TestBench.java | 4 +- .../tests/TestForBasicApplicationLayout.java | 10 ++-- 11 files changed, 88 insertions(+), 72 deletions(-) create mode 100644 src/com/itmill/toolkit/terminal/gwt/client/ui/TreeImages.java create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/default/tree/img/collapsed.png create mode 100644 src/com/itmill/toolkit/terminal/gwt/public/default/tree/img/expanded.png diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java index 03aa883d91..81e6e922f3 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java @@ -96,10 +96,10 @@ public class IFilterSelect extends Composite implements Paintable, Element root = getElement(); - DOM.setInnerText(up, "prev"); - DOM.sinkEvents(up, Event.ONCLICK); - DOM.setInnerText(down, "next"); - DOM.sinkEvents(down, Event.ONCLICK); + DOM.setInnerHTML(up, "Prev"); + DOM.sinkEvents(DOM.getChild(up, 0), Event.ONCLICK); + DOM.setInnerHTML(down, "Next"); + DOM.sinkEvents(DOM.getChild(down, 0), Event.ONCLICK); DOM.insertChild(root, up, 0); DOM.appendChild(root, down); DOM.appendChild(root, status); @@ -173,9 +173,9 @@ public class IFilterSelect extends Composite implements Paintable, public void onBrowserEvent(Event event) { Element target = DOM.eventGetTarget(event); - if (DOM.compare(target, up)) { + if (DOM.compare(target, up) || DOM.compare(target, DOM.getChild(up, 0))) { filterOptions(currentPage - 1, lastFilter); - } else if (DOM.compare(target, down)) { + } else if (DOM.compare(target, down) || DOM.compare(target, DOM.getChild(down, 0))) { filterOptions(currentPage + 1, lastFilter); } tb.setFocus(true); diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java index 7bce859119..a836d4a95f 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPanel.java @@ -29,19 +29,9 @@ public class IPanel extends SimplePanel implements Paintable, public IPanel() { super(); - setStyleName(CLASSNAME); - DOM.appendChild(getElement(), captionNode); - DOM - .setElementProperty(captionNode, "className", CLASSNAME - + "-caption"); DOM.appendChild(getElement(), contentNode); - DOM - .setElementProperty(contentNode, "className", CLASSNAME - + "-content"); DOM.appendChild(getElement(), bottomDecoration); - DOM.setElementProperty(bottomDecoration, "className", CLASSNAME - + "-deco"); } protected Element getContainerElement() { @@ -72,23 +62,25 @@ public class IPanel extends SimplePanel implements Paintable, // Add proper style name for root element // TODO refactor to support additional styles set from server-side + String className = CLASSNAME; if (uidl.hasAttribute("style")) - setStyleName(CLASSNAME + " " + CLASSNAME + "-" - + uidl.getStringAttribute("style")); - else - setStyleName(CLASSNAME); + className += "-" + uidl.getStringAttribute("style"); + setStyleName(className); + DOM.setElementProperty(contentNode, "className", className + "-content"); + DOM.setElementProperty(bottomDecoration, "className", className + + "-deco"); // Handle caption displaying if (uidl.hasAttribute("caption") && !uidl.getStringAttribute("caption").equals("")) { - DOM.setInnerHTML(captionNode, uidl.getStringAttribute("caption")); - DOM.setElementProperty(captionNode, "className", CLASSNAME + DOM.setInnerText(captionNode, uidl.getStringAttribute("caption")); + DOM.setElementProperty(captionNode, "className", className + "-caption"); } else { // Theme needs this to work around different styling - DOM.setElementProperty(captionNode, "className", CLASSNAME + DOM.setElementProperty(captionNode, "className", className + "-nocaption"); - DOM.setInnerHTML(captionNode, ""); + DOM.setInnerText(captionNode, ""); } // Height adjustment diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java index 5f7da590f3..6a3ef49823 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java @@ -5,11 +5,13 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.Tree; +import com.google.gwt.user.client.ui.TreeImages; import com.google.gwt.user.client.ui.TreeItem; import com.google.gwt.user.client.ui.TreeListener; import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection; @@ -45,7 +47,7 @@ public class ITree extends Tree implements Paintable { private boolean immediate; public ITree() { - super(); + super((TreeImages)GWT.create(com.itmill.toolkit.terminal.gwt.client.ui.TreeImages.class)); setStyleName(CLASSNAME); } diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeImages.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeImages.java new file mode 100644 index 0000000000..e404a7caea --- /dev/null +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/TreeImages.java @@ -0,0 +1,23 @@ +package com.itmill.toolkit.terminal.gwt.client.ui; + +import com.google.gwt.user.client.ui.AbstractImagePrototype; + +public interface TreeImages extends com.google.gwt.user.client.ui.TreeImages { + + /** + * An image indicating an open branch. + * + * @return a prototype of this image + * @gwt.resource com/itmill/toolkit/terminal/gwt/public/default/tree/img/expanded.png + */ + AbstractImagePrototype treeOpen(); + + /** + * An image indicating a closed branch. + * + * @return a prototype of this image + * @gwt.resource com/itmill/toolkit/terminal/gwt/public/default/tree/img/collapsed.png + */ + AbstractImagePrototype treeClosed(); + +} diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css index 9b91f64438..639f734d2a 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/panel/panel.css @@ -1,7 +1,11 @@ .i-panel, .i-panel-caption, .i-panel-content, -.i-panel-deco { +.i-panel-deco, +.i-panel-light, +.i-panel-light-caption, +.i-panel-light-content, +.i-panel-light-deco { outline: none; /* Prevent selection outline which might break layouts or cause scrollbars */ } @@ -13,7 +17,8 @@ margin-left: 9px; } -.i-panel-caption { +.i-panel-caption, +.i-panel-light-caption { font-size: 18px; line-height: 18px; font-weight: normal; @@ -77,55 +82,35 @@ /* Light panel style */ -.i-panel-light:before { - display: none; -} - -.i-panel-light .i-panel-caption { +.i-panel-light-caption { border-left: none; border-right: none; background: transparent; + padding-top: 14px; } -.i-panel-light .i-panel-caption:before, -.i-panel-light .i-panel-nocaption:before { - display: none; -} - -.i-panel-light .i-panel-content { +.i-panel-light-content { border: none; background: transparent; } -.i-panel-light .i-panel-deco { - /*display: none;*/ +.i-panel-light-deco { height: 0; overflow: hidden; } -.i-panel-light .i-panel-deco:before { - display: none; -} - /* Light panel contained within another panel or a tabsheet */ /* Use more precise selector to override IE specific rules automatically */ -.i-panel .i-panel-light .i-panel-caption, -.i-tabsheet .i-panel-light .i-panel-caption { - border-left: none; - border-right: none; - /*margin: -16px -18px 0 -18px;*/ +.i-panel .i-panel-light-caption, +.i-tabsheet .i-panel-light-caption { margin-top: -1px; padding-top: 14px; border-top: 1px solid #babfc0; } -.i-panel .i-panel-light .i-panel-content, -.i-tabsheet .i-panel-light .i-panel-content { - /*margin: 0 -18px 16px -18px;*/ -} @@ -146,11 +131,11 @@ * html .i-panel-content { border-bottom: 1px solid #babfc0; - padding: 15px 18px; + /*padding: 15px 18px;*/ } *+html .i-panel-content { border-bottom: 1px solid #babfc0; - padding: 15px 18px; + /*padding: 15px 18px;*/ } * html .i-panel-deco { diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css b/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css index 04f1207343..6a3fe14392 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/select/filterselect.css @@ -72,11 +72,6 @@ margin-top: 2px; } -/* For some silly reason IE6 leaks some negative margins to the text input */ -* html .i-panel .i-panel-light .i-panel-content .i-filterselect-input, -* html .i-tabsheet .i-panel-light .i-panel-content .i-filterselect-input { - margin-left: 22px; -} *+html .i-filterselect-input { margin-top: 1px; } diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/img/collapsed.png b/src/com/itmill/toolkit/terminal/gwt/public/default/tree/img/collapsed.png new file mode 100644 index 0000000000000000000000000000000000000000..8d4064de0ac4cb7e59e0ecc6c54596e2cc555b36 GIT binary patch literal 3637 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 Q9RL6T07*qoM6N<$g8K#My#N3J literal 0 HcmV?d00001 diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css index 60a220c67d..befd6e4cf2 100644 --- a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css +++ b/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css @@ -1,6 +1,27 @@ -.i-tree-node-selected > table > tbody > tr > td > span.gwt-TreeItem { - background: #ff0; +.i-tree .gwt-TreeItem { + cursor: pointer; } -span.gwt-TreeItem { - cursor: pointer; + +.i-tree-node-selected > table > tbody > tr > td > .gwt-TreeItem { + background: #5daee8; + color: #fff; + display: block; + padding: 1px; + margin: -1px -1px; +} +.i-tree-node-selected > table > tbody > tr > td > .gwt-TreeItem:before { + display: block; + float: left; + content: url(../common/img/blank.gif); + width: 1px; + background: #5daee8; + margin: 0 1px 0 -2px; +} +.i-tree-node-selected > table > tbody > tr > td > .gwt-TreeItem:after { + display: block; + float: right; + content: url(../common/img/blank.gif); + width: 1px; + background: #5daee8; + margin: 0 -2px 0 1px; } \ No newline at end of file diff --git a/src/com/itmill/toolkit/tests/TestBench.java b/src/com/itmill/toolkit/tests/TestBench.java index 7787d5c2bc..f792ad1d7c 100644 --- a/src/com/itmill/toolkit/tests/TestBench.java +++ b/src/com/itmill/toolkit/tests/TestBench.java @@ -92,17 +92,19 @@ public class TestBench extends com.itmill.toolkit.Application implements Class testable = (Class) i.next(); menu.setItemCaption(testable, testable.getSimpleName()); } - menu.setStyle("menu"); menu.addListener(this); menu.setImmediate(true); mainLayout.addComponent(menu); + bodyLayout.setStyle("light"); bodyLayout.setHeight(100); bodyLayout.setHeightUnits(Panel.UNITS_PERCENTAGE); bodyLayout.setLayout(new ExpandLayout()); mainLayout.addComponent(bodyLayout); + + mainLayout.setSplitPosition(30); mainWindow.setLayout(mainLayout); diff --git a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java b/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java index 1edbc0b83f..de23643681 100644 --- a/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java +++ b/src/com/itmill/toolkit/tests/TestForBasicApplicationLayout.java @@ -23,8 +23,6 @@ public class TestForBasicApplicationLayout extends CustomComponent { private TabSheet tab; public TestForBasicApplicationLayout() { - OrderedLayout main = new OrderedLayout(); - setCompositionRoot(main); click = new Button("Set height -1", new ClickListener() { @@ -44,12 +42,10 @@ public class TestForBasicApplicationLayout extends CustomComponent { }); SplitPanel sp = new SplitPanel(SplitPanel.ORIENTATION_HORIZONTAL); - sp.setSplitPosition(290, Sizeable.UNITS_PIXELS); // Width of left - // side area + sp.setSplitPosition(290, Sizeable.UNITS_PIXELS); SplitPanel sp2 = new SplitPanel(SplitPanel.ORIENTATION_VERTICAL); - sp2.setSplitPosition(255, Sizeable.UNITS_PIXELS); // Height of - // right-top area + sp2.setSplitPosition(255, Sizeable.UNITS_PIXELS); Panel p = new Panel("Accordion Panel"); p.setHeight(100); @@ -102,7 +98,7 @@ public class TestForBasicApplicationLayout extends CustomComponent { sp.setFirstComponent(p); sp.setSecondComponent(tab); - main.addComponent(sp); + setCompositionRoot(sp); } } -- 2.39.5