Skip to content

Fixes a layout problem in CdiPanel #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2017
Merged

Fixes a layout problem in CdiPanel #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions src/org/openlcb/cdi/swing/CdiPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,33 +775,33 @@ JPanel createIdentificationPane(CdiRep c) {
//p.setBorder(BorderFactory.createTitledBorder("Identification"));

CdiRep.Identification id = c.getIdentification();

JPanel p1 = new JPanel();
p.add(p1);
p1.setLayout(new util.javaworld.GridLayout2(4,2));
p1.setAlignmentX(Component.LEFT_ALIGNMENT);

p1.add(new JLabel("Manufacturer: "));
p1.add(new JLabel(id.getManufacturer()));

p1.add(new JLabel("Model: "));
p1.add(new JLabel(id.getModel()));

p1.add(new JLabel("Hardware Version: "));
p1.add(new JLabel(id.getHardwareVersion()));

p1.add(new JLabel("Software Version: "));
p1.add(new JLabel(id.getSoftwareVersion()));

p1.setMaximumSize(p1.getPreferredSize());

// include map if present
JPanel p2 = createPropertyPane(id.getMap());
if (p2!=null) {
p2.setAlignmentX(Component.LEFT_ALIGNMENT);
p.add(p2);
}

JPanel ret = new util.CollapsiblePanel("Identification", p);
ret.setAlignmentY(Component.TOP_ALIGNMENT);
ret.setAlignmentX(Component.LEFT_ALIGNMENT);
Expand All @@ -818,7 +818,7 @@ JPanel createPropertyPane(CdiRep.Map map) {
JPanel p2 = new JPanel();
p2.setAlignmentX(Component.LEFT_ALIGNMENT);
p2.setBorder(BorderFactory.createTitledBorder("Properties"));

java.util.List keys = map.getKeys();
if (keys.isEmpty()) return null;

Expand All @@ -829,12 +829,13 @@ JPanel createPropertyPane(CdiRep.Map map) {

p2.add(new JLabel(key+": "));
p2.add(new JLabel(map.getEntry(key)));

}
p2.setMaximumSize(p2.getPreferredSize());
return p2;
} else
} else {
return null;
}
}

public class SegmentPane extends JPanel {
Expand All @@ -856,15 +857,19 @@ public class SegmentPane extends JPanel {
void createDescriptionPane(JPanel parent, String d) {
if (d == null) return;
if (d.trim().length() == 0) return;
JTextArea area = new JTextArea(d);
JTextArea area = new JTextArea(d) {
// Prevents the area from expanding vertically when there is vertical space to acquire.
@Override
public Dimension getMaximumSize() {
return new Dimension(Integer.MAX_VALUE, getPreferredSize().height);
}
};
area.setAlignmentX(Component.LEFT_ALIGNMENT);
area.setFont(UIManager.getFont("Label.font"));
area.setEditable(false);
area.setOpaque(false);
area.setWrapStyleWord(true);
area.setWrapStyleWord(true);
area.setLineWrap(true);
area.setMaximumSize(
new Dimension(Integer.MAX_VALUE, area.getPreferredSize().height) );
parent.add(area);
}

Expand Down Expand Up @@ -1366,9 +1371,9 @@ protected String getDisplayText() {
}
}

/**
/**
* Provide access to e.g. a MemoryConfig service.
*
*
* Default just writes output for debug
*/
public static class ReadWriteAccess {
Expand All @@ -1381,10 +1386,10 @@ public void doRead(long address, int space, int length, final MemoryConfiguratio
logger.log(Level.FINE, "Read from {0} in space {1}", new Object[]{address, space});
}
}
/**

/**
* Handle GUI hook requests if needed
*
*
* Default behavior is to do nothing
*/
public static class GuiItemFactory {
Expand Down