From 3aab8e558b60088bb6dca5e75a320ef3dc6b0aba Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Mon, 9 Jul 2012 10:13:27 +0000 Subject: #7387 Render block elements in TreeTable hierarchy column correctly: draw the expand/collapse arrow as position: absolute and use padding for indentation. Also fix typo "ident" -> "indent". svn changeset:23994/svn branch:6.8 --- WebContent/VAADIN/themes/base/treetable/treetable.css | 14 +++++++++----- WebContent/VAADIN/themes/reindeer/table/table.css | 6 +++--- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'WebContent/VAADIN') diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.css b/WebContent/VAADIN/themes/base/treetable/treetable.css index 1bc21b890c..662839a4a2 100644 --- a/WebContent/VAADIN/themes/base/treetable/treetable.css +++ b/WebContent/VAADIN/themes/base/treetable/treetable.css @@ -4,13 +4,13 @@ height: 10px; /* defines the amount of indent per level */ width: 18px; -} -.v-ie7 .v-treetable-treespacer{ - height: 100%; /* #7388 */ + position: absolute; + left: 0; + top: 5px; } .v-treetable-node-closed { - background: url(../treetable/img/arrow-right.png) right center no-repeat; + background: url(../treetable/img/arrow-right.png) right top no-repeat; } .v-ie6 .v-treetable-node-closed { @@ -18,7 +18,7 @@ } .v-treetable-node-open { - background: url(../treetable/img/arrow-down.png) right center no-repeat; + background: url(../treetable/img/arrow-down.png) right top no-repeat; } .v-ie6 .v-treetable-node-open { @@ -36,6 +36,10 @@ z-index: 10; } +.v-treetable .v-table-cell-wrapper { + position: relative; +} + .v-treetable .v-table-body .v-table-table .v-table-row-animating { zoom:1; z-index:1; diff --git a/WebContent/VAADIN/themes/reindeer/table/table.css b/WebContent/VAADIN/themes/reindeer/table/table.css index 2e6c597160..cab7d6a01f 100644 --- a/WebContent/VAADIN/themes/reindeer/table/table.css +++ b/WebContent/VAADIN/themes/reindeer/table/table.css @@ -130,9 +130,9 @@ text-shadow: #f3f5f8 0 1px 0; line-height: normal; } -.v-table-generated-row .v-table-cell-content { - padding-top: 1px; - padding-bottom: 2px; +.v-table-generated-row .v-table-cell-wrapper { + padding-top: 4px; + padding-bottom: 5px; } .v-table-cell-content:last-child { border-right-color: transparent; -- cgit v1.2.3 From 8437fd18348dfe378635ac378de8ee26b35223a3 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Mon, 9 Jul 2012 14:15:53 +0000 Subject: #9064 Render checkboxes in a Table as display: inline-block like TreeTable already does svn changeset:24002/svn branch:6.8 --- WebContent/VAADIN/themes/base/table/table.css | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'WebContent/VAADIN') diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css index 2c1e3d9593..b5bf1ef53c 100644 --- a/WebContent/VAADIN/themes/base/table/table.css +++ b/WebContent/VAADIN/themes/base/table/table.css @@ -252,6 +252,11 @@ .v-off { color: #ddd; } + +.v-table .v-checkbox { + display: inline-block; +} + /************************************* * Drag'n'drop styles *************************************/ -- cgit v1.2.3 From 7edff2dad305481601cdd6c876d24fd7a4f3f9a3 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Wed, 25 Jul 2012 11:08:36 +0000 Subject: Make a read-only RichTextArea scrollable (#7036) svn changeset:24024/svn branch:6.8 --- WebContent/VAADIN/themes/base/textfield/richtext.css | 9 ++++++++- .../terminal/gwt/client/ui/richtextarea/VRichTextArea.java | 13 ++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) (limited to 'WebContent/VAADIN') diff --git a/WebContent/VAADIN/themes/base/textfield/richtext.css b/WebContent/VAADIN/themes/base/textfield/richtext.css index a304fa2a57..98726756f5 100644 --- a/WebContent/VAADIN/themes/base/textfield/richtext.css +++ b/WebContent/VAADIN/themes/base/textfield/richtext.css @@ -1,12 +1,19 @@ .v-richtextarea { border: 1px solid #aaa; - overflow: hidden; } .v-richtextarea .gwt-RichTextArea { background: #fff; border: none; } +/* IE6 needs a hack to render the editor with a correct height */ +.v-ie6 .v-richtextarea { + overflow: hidden; +} +.v-ie6 .v-scrollable { + overflow: auto; +} + .v-richtextarea .gwt-RichTextToolbar { white-space: nowrap; background: #959595 url(img/richtext-toolbar-bg.png) repeat-x 0 -42px; diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java index bf0a423474..54a8ff6ad6 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java +++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java @@ -34,6 +34,8 @@ import com.vaadin.terminal.gwt.client.ui.Field; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; +import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate; +import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler; /** * This class implements a basic client side rich text editor component. @@ -81,6 +83,8 @@ public class VRichTextArea extends Composite implements Paintable, Field, private boolean readOnly = false; + private TouchScrollHandler touchScrollHandler = null; + public VRichTextArea() { createRTAComponents(); fp.add(formatter); @@ -88,7 +92,6 @@ public class VRichTextArea extends Composite implements Paintable, Field, initWidget(fp); setStyleName(CLASSNAME); - } private void createRTAComponents() { @@ -120,10 +123,18 @@ public class VRichTextArea extends Composite implements Paintable, Field, } rta.setHTML(currentValue); fp.add(rta); + if (touchScrollHandler != null) { + touchScrollHandler.removeElement(fp.getElement()); + } } else { html.setHTML(currentValue); fp.remove(rta); fp.add(html); + if (touchScrollHandler == null) { + touchScrollHandler = TouchScrollDelegate + .enableTouchScrolling(this); + } + touchScrollHandler.addElement(fp.getElement()); } } -- cgit v1.2.3 From 07ec6a6db41fb5059b1c2ad556de8b7b59f08b10 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Thu, 26 Jul 2012 08:51:23 +0000 Subject: Reverted #7036 patch, will write a better one svn changeset:24026/svn branch:6.8 --- WebContent/VAADIN/themes/base/textfield/richtext.css | 9 +-------- .../terminal/gwt/client/ui/richtextarea/VRichTextArea.java | 13 +------------ 2 files changed, 2 insertions(+), 20 deletions(-) (limited to 'WebContent/VAADIN') diff --git a/WebContent/VAADIN/themes/base/textfield/richtext.css b/WebContent/VAADIN/themes/base/textfield/richtext.css index 98726756f5..a304fa2a57 100644 --- a/WebContent/VAADIN/themes/base/textfield/richtext.css +++ b/WebContent/VAADIN/themes/base/textfield/richtext.css @@ -1,19 +1,12 @@ .v-richtextarea { border: 1px solid #aaa; + overflow: hidden; } .v-richtextarea .gwt-RichTextArea { background: #fff; border: none; } -/* IE6 needs a hack to render the editor with a correct height */ -.v-ie6 .v-richtextarea { - overflow: hidden; -} -.v-ie6 .v-scrollable { - overflow: auto; -} - .v-richtextarea .gwt-RichTextToolbar { white-space: nowrap; background: #959595 url(img/richtext-toolbar-bg.png) repeat-x 0 -42px; diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java index 54a8ff6ad6..bf0a423474 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java +++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java @@ -34,8 +34,6 @@ import com.vaadin.terminal.gwt.client.ui.Field; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; -import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate; -import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate.TouchScrollHandler; /** * This class implements a basic client side rich text editor component. @@ -83,8 +81,6 @@ public class VRichTextArea extends Composite implements Paintable, Field, private boolean readOnly = false; - private TouchScrollHandler touchScrollHandler = null; - public VRichTextArea() { createRTAComponents(); fp.add(formatter); @@ -92,6 +88,7 @@ public class VRichTextArea extends Composite implements Paintable, Field, initWidget(fp); setStyleName(CLASSNAME); + } private void createRTAComponents() { @@ -123,18 +120,10 @@ public class VRichTextArea extends Composite implements Paintable, Field, } rta.setHTML(currentValue); fp.add(rta); - if (touchScrollHandler != null) { - touchScrollHandler.removeElement(fp.getElement()); - } } else { html.setHTML(currentValue); fp.remove(rta); fp.add(html); - if (touchScrollHandler == null) { - touchScrollHandler = TouchScrollDelegate - .enableTouchScrolling(this); - } - touchScrollHandler.addElement(fp.getElement()); } } -- cgit v1.2.3 From ca9fab0922d9db510c51f2d363b46577f7f6c0c4 Mon Sep 17 00:00:00 2001 From: Johannes Dahlström Date: Thu, 26 Jul 2012 09:57:12 +0000 Subject: A better patch and test for #7036 svn changeset:24027/svn branch:6.8 --- .../VAADIN/themes/base/textfield/richtext.css | 4 +- .../gwt/client/ui/richtextarea/VRichTextArea.java | 2 + .../richtextarea/RichTextAreaScrolling.html | 27 ++++++++++ .../richtextarea/RichTextAreaScrolling.java | 57 ++++++++++++++++++++++ 4 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html create mode 100644 tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java (limited to 'WebContent/VAADIN') diff --git a/WebContent/VAADIN/themes/base/textfield/richtext.css b/WebContent/VAADIN/themes/base/textfield/richtext.css index a304fa2a57..6a236886cc 100644 --- a/WebContent/VAADIN/themes/base/textfield/richtext.css +++ b/WebContent/VAADIN/themes/base/textfield/richtext.css @@ -6,7 +6,9 @@ background: #fff; border: none; } - +.v-richtextarea .gwt-HTML { + height: 100%; +} .v-richtextarea .gwt-RichTextToolbar { white-space: nowrap; background: #959595 url(img/richtext-toolbar-bg.png) repeat-x 0 -42px; diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java index bf0a423474..08df928194 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java +++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java @@ -34,6 +34,7 @@ import com.vaadin.terminal.gwt.client.ui.Field; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.BeforeShortcutActionListener; import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner; +import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate; /** * This class implements a basic client side rich text editor component. @@ -89,6 +90,7 @@ public class VRichTextArea extends Composite implements Paintable, Field, initWidget(fp); setStyleName(CLASSNAME); + TouchScrollDelegate.enableTouchScrolling(html, html.getElement()); } private void createRTAComponents() { diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html new file mode 100644 index 0000000000..be1c5a2cde --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.html @@ -0,0 +1,27 @@ + + + + + + +RichTextAreaScrolling + + + + + + + + + + + + + + + + + +
RichTextAreaScrolling
open/run/com.vaadin.tests.components.richtextarea.RichTextAreaScrolling?restartApplication
screenCapture
+ + diff --git a/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java new file mode 100644 index 0000000000..f88ed0c67c --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/richtextarea/RichTextAreaScrolling.java @@ -0,0 +1,57 @@ +package com.vaadin.tests.components.richtextarea; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.HorizontalLayout; +import com.vaadin.ui.RichTextArea; +import com.vaadin.ui.VerticalLayout; + +public class RichTextAreaScrolling extends TestBase { + + @Override + protected String getDescription() { + return "A read-only RichTextArea should be (touch) scrollable"; + } + + @Override + protected Integer getTicketNumber() { + return 7036; + } + + @Override + protected void setup() { + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < 50; ++i) { + sb.append("A long string with several lines
"); + } + + HorizontalLayout main = new HorizontalLayout(); + main.setSpacing(true); + addComponent(main); + + RichTextArea first = new RichTextArea("Defined height"); + RichTextArea second = new RichTextArea("Full height"); + RichTextArea third = new RichTextArea("Undefined height"); + + first.setValue(sb); + second.setValue(sb); + third.setValue(sb); + + first.setReadOnly(true); + second.setReadOnly(true); + third.setReadOnly(true); + + first.setWidth("200px"); + first.setHeight("400px"); + second.setSizeFull(); + third.setSizeUndefined(); + + VerticalLayout secondLayout = new VerticalLayout(); + secondLayout.setWidth("200px"); + secondLayout.setHeight("200px"); + secondLayout.addComponent(second); + + main.addComponent(first); + main.addComponent(secondLayout); + main.addComponent(third); + } +} -- cgit v1.2.3