BDC/diy-layout-creator
2
0
Fork 0
mirror of https://github.com/bancika/diy-layout-creator synced 2026-11-07 12:24:58 +10:00
Code Issues Packages Projects Releases Wiki Activity

Added ability to collapse and expand the component tree panel to the

Browse Source 
left edge of the screen
This commit is contained in:
bancika
2020-03-25 16:31:43 +01:00
parent 4718ba6592
commit 804ac2a82a
8 changed files with 201 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
diylc/diylc-core/src/org/diylc/presenter/update.xml
+4 -1
View File
@@ -2721,7 +2721,10 @@
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>New app icon!</description>
</org.diylc.appframework.update.Change>
</org.diylc.appframework.update.Change>
<org.diylc.appframework.update.Change>
<changeType>NEW_FEATURE</changeType>
<description>Added ability to collapse and expand the component tree panel to the left edge of the screen</description>
<org.diylc.appframework.update.Change>
<changeType>IMPROVEMENT</changeType>
<description>Upgraded to Java 8</description>
diylc/diylc-swing/src/org/diylc/swing/ISwingUI.java
+3 -2
View File
@@ -53,10 +53,11 @@ public interface ISwingUI extends IView {
* Center position is reserved for the main canvas panel and cannot be used.
*
* @param component
* @param position
* @param position
* @param collapsible
* @throws BadPositionException in case invalid position is specified
*/
void injectGUIComponent(JComponent component, int position) throws BadPositionException;
void injectGUIComponent(JComponent component, int position, boolean collapsible) throws BadPositionException;
/**
* Injects a custom menu action into application's main menu. If <code>action</code> is set to
diylc/diylc-swing/src/org/diylc/swing/gui/CollapsiblePanel.java
+183
View File
@@ -0,0 +1,183 @@
package org.diylc.swing.gui;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.ComponentListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import javax.swing.JPanel;
import javax.swing.SwingConstants;
import javax.swing.border.MatteBorder;
/***
* Panel that has a clickable line that can used to collapse and expand the contents of the panel.
*
* @author bancika
*/
public class CollapsiblePanel extends JPanel {
private static final long serialVersionUID = 1L;
private static int thickness = 4;
private MatteBorderEx border;
private Color defaultColor = Color.lightGray;
private Color highlightColor = Color.decode("#66CCFF");
public CollapsiblePanel(int position) {
border = new MatteBorderEx(position == SwingConstants.BOTTOM ? thickness : 0,
position == SwingConstants.RIGHT ? thickness : 0,
position == SwingConstants.TOP ? thickness : 0,
position == SwingConstants.LEFT ? thickness : 0, defaultColor);
setToolTipText("Click to collapse");
setBorder(border);
BorderLayout borderLayout = new BorderLayout();
setLayout(borderLayout);
addMouseListener(mouseListener);
}
MouseListener mouseListener = new MouseAdapter() {
@Override
public void mouseClicked(MouseEvent e) {
toggleVisibility();
}
public void mouseEntered(MouseEvent e) {
border.setMatteColor(highlightColor);
};
public void mouseExited(MouseEvent e) {
border.setMatteColor(defaultColor);
};
};
public Color getDefaultColor() {
return defaultColor;
}
public void setDefaultColor(Color defaultColor) {
this.defaultColor = defaultColor;
}
public Color getHighlightColor() {
return highlightColor;
}
public void setHighlightColor(Color highlightColor) {
this.highlightColor = highlightColor;
}
ComponentListener contentComponentListener = new ComponentAdapter() {
@Override
public void componentShown(ComponentEvent e) {
updateBorderTitle();
}
@Override
public void componentHidden(ComponentEvent e) {
updateBorderTitle();
}
};
@Override
public Component add(Component comp) {
comp.addComponentListener(contentComponentListener);
Component r = super.add(comp);
updateBorderTitle();
return r;
}
@Override
public Component add(String name, Component comp) {
comp.addComponentListener(contentComponentListener);
Component r = super.add(name, comp);
updateBorderTitle();
return r;
}
@Override
public Component add(Component comp, int index) {
comp.addComponentListener(contentComponentListener);
Component r = super.add(comp, index);
updateBorderTitle();
return r;
}
@Override
public void add(Component comp, Object constraints) {
comp.addComponentListener(contentComponentListener);
super.add(comp, constraints);
updateBorderTitle();
}
@Override
public void add(Component comp, Object constraints, int index) {
comp.addComponentListener(contentComponentListener);
super.add(comp, constraints, index);
updateBorderTitle();
}
@Override
public void remove(int index) {
Component comp = getComponent(index);
comp.removeComponentListener(contentComponentListener);
super.remove(index);
}
@Override
public void remove(Component comp) {
comp.removeComponentListener(contentComponentListener);
super.remove(comp);
}
@Override
public void removeAll() {
for (Component c : getComponents()) {
c.removeComponentListener(contentComponentListener);
}
super.removeAll();
}
protected void toggleVisibility() {
toggleVisibility(hasInvisibleComponent());
}
protected void toggleVisibility(boolean visible) {
for (Component c : getComponents()) {
c.setVisible(visible);
}
updateBorderTitle();
}
protected void updateBorderTitle() {
}
protected final boolean hasInvisibleComponent() {
for (Component c : getComponents()) {
if (!c.isVisible()) {
return true;
}
}
return false;
}
class MatteBorderEx extends MatteBorder {
public MatteBorderEx(int top, int left, int bottom, int right, Color matteColor) {
super(top, left, bottom, right, matteColor);
}
private static final long serialVersionUID = 1L;
public void setMatteColor(Color color) {
this.color = color;
repaint();
}
}
}
diylc/diylc-swing/src/org/diylc/swing/gui/MainFrame.java
+7 -2
View File
@@ -294,8 +294,13 @@ public class MainFrame extends JFrame implements ISwingUI {
}
@Override
public void injectGUIComponent(JComponent component, int position) throws BadPositionException {
LOG.info(String.format("injectGUIComponent(%s, %s)", component.getClass().getName(), position));
public void injectGUIComponent(JComponent component, int position, boolean collapsible) throws BadPositionException {
LOG.info(String.format("injectGUIComponent(%s, %s, %s)", component.getClass().getName(), position, collapsible));
if (collapsible) {
CollapsiblePanel panel = new CollapsiblePanel(position);
panel.add(component);
component = panel;
}
switch (position) {
case SwingConstants.TOP:
topPanel.add(component);
diylc/diylc-swing/src/org/diylc/swing/plugins/canvas/CanvasPlugin.java
+1 -1
View File
@@ -135,7 +135,7 @@ public class CanvasPlugin implements IPlugIn, ClipboardOwner {
public void connect(IPlugInPort plugInPort) {
this.plugInPort = plugInPort;
try {
swingUI.injectGUIComponent(getScrollPane(), SwingConstants.CENTER);
swingUI.injectGUIComponent(getScrollPane(), SwingConstants.CENTER, false);
} catch (BadPositionException e) {
LOG.error("Could not install canvas plugin", e);
}
diylc/diylc-swing/src/org/diylc/swing/plugins/statusbar/StatusBar.java
+1 -1
View File
@@ -122,7 +122,7 @@ public class StatusBar extends JPanel implements IPlugIn {
setLayout(new GridBagLayout());
try {
swingUI.injectGUIComponent(this, SwingUtilities.BOTTOM);
swingUI.injectGUIComponent(this, SwingUtilities.BOTTOM, false);
} catch (BadPositionException e) {
LOG.error("Could not install status bar", e);
}
diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ToolBox.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class ToolBox implements IPlugIn {
public void connect(IPlugInPort plugInPort) {
this.plugInPort = plugInPort;
try {
swingUI.injectGUIComponent(getComponentTabbedPane(), SwingConstants.TOP);
swingUI.injectGUIComponent(getComponentTabbedPane(), SwingConstants.TOP, false);
} catch (BadPositionException e) {
LOG.error("Could not install the toolbox", e);
}
diylc/diylc-swing/src/org/diylc/swing/plugins/tree/ComponentTree.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class ComponentTree implements IPlugIn {
public void connect(IPlugInPort plugInPort) {
this.plugInPort = plugInPort;
try {
swingUI.injectGUIComponent(getTreePanel(), SwingConstants.LEFT);
swingUI.injectGUIComponent(getTreePanel(), SwingConstants.LEFT, true);
} catch (BadPositionException e) {
LOG.error("Could not install the component tree", e);
}