test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-05 04:38:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refs #1372 ScrollBox usage improvement

Browse Source
This commit is contained in:
Konstantin Krivopustov 2012-08-15 07:31:18 +00:00
parent 05a40dca05
commit 87e1bd227c
3 changed files with 141 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/desktop/src/com/haulmont/cuba/desktop/gui/components/DesktopScrollBoxLayout.java
View File

@ -11,6 +11,9 @@ import com.haulmont.cuba.gui.components.ScrollBoxLayout;
import org.apache.commons.lang.ObjectUtils;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@ -35,6 +38,21 @@ public class DesktopScrollBoxLayout extends DesktopAbstractComponent<JScrollPane
content = new DesktopVBox();
impl.setViewportView(DesktopComponentsHelper.getComposition(content));
// support tables with 100% width like in web
impl.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(ComponentEvent e) {
adjustViewPreferredSize();
}
});
}
private void adjustViewPreferredSize() {
JComponent view = DesktopComponentsHelper.getComposition(content);
Dimension minimumSize = view.getMinimumSize();
int width = Math.max(minimumSize.width, impl.getViewport().getWidth());
view.setPreferredSize(new Dimension(width, minimumSize.height));
}
@Override
@ -52,6 +70,8 @@ public class DesktopScrollBoxLayout extends DesktopAbstractComponent<JScrollPane
}
content.add(component);
adjustViewPreferredSize();
}
@Override

195
modules/desktop/test/com/haulmont/cuba/desktop/sys/vcl/VclTestApp.java
View File

@ -15,9 +15,7 @@ import javax.swing.*;
import javax.swing.event.MouseInputAdapter;
import javax.swing.table.AbstractTableModel;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.*;
import java.util.Date;
import java.util.Iterator;
import java.util.Map;
@ -90,14 +88,129 @@ public class VclTestApp extends JFrame {
JTabbedPane tabbedPane = new JTabbedPane();
add(tabbedPane, BorderLayout.CENTER);
tabbedPane.add("Align", createAlignTab());
tabbedPane.add("Table", createTableTab());
tabbedPane.add("Align", createAlignTab());
tabbedPane.add("TextArea", createTextAreaTab());
tabbedPane.add("Popup", createPopupTab());
tabbedPane.add("Picker", createPickersTab());
// tabbedPane.add("Autocomplete", createAutocompleteTab());
}
public static class MyPanel extends JPanel implements Scrollable {
@Override
public Dimension getPreferredScrollableViewportSize() {
return getPreferredSize();
}
@Override
public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
return 10;
}
@Override
public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) {
return visibleRect.width;
}
@Override
public boolean getScrollableTracksViewportWidth() {
// final Container viewport = getParent();
// System.out.println("viewport.width=" + viewport.getWidth() + ", minimumSize.width=" + getMinimumSize().width);
// return viewport.getWidth() > getMinimumSize().width;
return false;
}
@Override
public boolean getScrollableTracksViewportHeight() {
return false;
}
}
private Component createTableTab() {
final JPanel box = new JPanel();
box.setFocusable(false);
MigLayout boxLayout = new MigLayout("fill");
box.setLayout(boxLayout);
final JScrollPane outerScrollPane = new JScrollPane();
outerScrollPane.setViewportView(box);
outerScrollPane.addComponentListener(new ComponentAdapter() {
@Override
public void componentResized(ComponentEvent e) {
final Dimension minimumSize = box.getMinimumSize();
final int width = Math.max(minimumSize.width, outerScrollPane.getViewport().getWidth());
box.setPreferredSize(new Dimension(width, minimumSize.height));
}
});
JPanel tablePanel = new JPanel();
MigLayout tablePanellayout = new MigLayout("flowy, fill, insets 0", "", "[min!][fill]");
tablePanel.setLayout(tablePanellayout);
JPanel topPanel = new JPanel(new FlowLayout());
topPanel.setVisible(true);
tablePanel.add(topPanel/*, "growx"*/);
topPanel.add(new JButton("Button1"));
topPanel.add(new JButton("Button2"));
topPanel.add(new JButton("Button3"));
topPanel.add(new JButton("Button4"));
topPanel.add(new JButton("Button5"));
JXTableExt table = new JXTableExt();
JScrollPane tableScrollPane = new JScrollPane(table);
// table.setFillsViewportHeight(true);
tablePanel.add(tableScrollPane, "grow");
table.setShowGrid(true);
table.setGridColor(Color.lightGray);
table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
table.setColumnControlVisible(true);
table.setModel(new AbstractTableModel() {
@Override
public int getRowCount() {
return 20;
}
@Override
public int getColumnCount() {
return 20;
}
@Override
public Object getValueAt(int rowIndex, int columnIndex) {
return rowIndex + "-" + columnIndex;
}
});
CC cc = new CC();
// cc.growX(0);
// cc.width("300!");
cc.width("100%");
// cc.growY(0.0f);
cc.height("200!");
// cc.height("100%");
box.add(tablePanel);
boxLayout.setComponentConstraints(tablePanel, cc);
// cc = new CC();
// cc.growX(0);
// cc.width("300!");
// cc.width("100%");
// cc.height("200!");
// tablePanellayout.setComponentConstraints(tableScrollPane, cc);
return outerScrollPane;
}
private Component createAlignTab() {
JPanel box = new JPanel();
box.setFocusable(false);
@ -136,80 +249,6 @@ public class VclTestApp extends JFrame {
return box;
}
private Component createTableTab() {
JPanel box = new JPanel();
box.setFocusable(false);
MigLayout boxLayout = new MigLayout("debug 1000");
box.setLayout(boxLayout);
JPanel panel = new JPanel();
MigLayout layout = new MigLayout("debug 1000, flowy, fill, insets 0", "", "[min!][fill]");
panel.setLayout(layout);
JPanel topPanel = new JPanel(new FlowLayout());
topPanel.setVisible(true);
panel.add(topPanel, "growx");
topPanel.add(new JButton("Button1"));
topPanel.add(new JButton("Button2"));
topPanel.add(new JButton("Button3"));
topPanel.add(new JButton("Button4"));
topPanel.add(new JButton("Button5"));
JXTableExt impl = new JXTableExt();
// JPanel tablePanel = new JPanel(new BorderLayout());
JScrollPane scrollPane = new JScrollPane(impl);
impl.setFillsViewportHeight(true);
// tablePanel.add(scrollPane, BorderLayout.CENTER);
panel.add(scrollPane, "grow");
impl.setShowGrid(true);
impl.setGridColor(Color.lightGray);
impl.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
impl.setColumnControlVisible(true);
impl.setModel(new AbstractTableModel() {
@Override
public int getRowCount() {
return 20;
}
@Override
public int getColumnCount() {
return 20;
}
@Override
public Object getValueAt(int rowIndex, int columnIndex) {
return rowIndex + "-" + columnIndex;
}
});
CC cc = new CC();
cc.growX(0);
cc.width("300!");
// cc.width("100%");
cc.growY(0.0f);
cc.height("200!");
// cc.height("100%");
box.add(panel);
boxLayout.setComponentConstraints(panel, cc);
cc = new CC();
cc.growX(0);
cc.width("300!");
// cc.width("100%");
layout.setComponentConstraints(scrollPane, cc);
return box;
}
private Component createTextAreaTab() {
JPanel panel = new JPanel();
panel.setLayout(new MigLayout("flowy, fill", "[]", "[min!][fill]"));

8
modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/ScrollBoxLayoutLoader.java
View File

@ -44,15 +44,15 @@ public class ScrollBoxLayoutLoader extends ContainerLoader implements com.haulmo
loadSubComponents(component, element, "visible");
for (Component child : component.getOwnComponents()) {
if (ComponentsHelper.hasFullHeight(child)) {
if (component.getOrientation() == ScrollBoxLayout.Orientation.VERTICAL && ComponentsHelper.hasFullHeight(child)) {
child.setHeight("-1px");
log.warn("100% height of " + child.getClass().getSimpleName() + " id=" + child.getId()
+ " inside scrollBox replaced with -1px height");
+ " inside vertical scrollBox replaced with -1px height");
}
if (ComponentsHelper.hasFullWidth(child)) {
if (component.getOrientation() == ScrollBoxLayout.Orientation.HORIZONTAL && ComponentsHelper.hasFullWidth(child)) {
child.setWidth("-1px");
log.warn("100% width of " + child.getClass().getSimpleName() + " id=" + child.getId()
+ " inside scrollBox replaced with -1px width");
+ " inside horizontal scrollBox replaced with -1px width");
}
}