eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

make buttons align properly to the scrollbar

Browse Source
This commit is contained in:
Ben Fry
2015-09-19 22:04:57 -04:00
parent 0e8a90da2b
commit 59b0abba01
2 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/contrib/StatusPanel.java
+18 -16
View File
@@ -55,7 +55,7 @@ class StatusPanel extends JPanel {
JTextPane label;
JButton installButton;
JPanel progressBarPanel;
JPanel progressPanel;
JLabel updateLabel;
JButton updateButton;
JButton removeButton;
@@ -118,9 +118,9 @@ class StatusPanel extends JPanel {
StatusPanel.this.update(currentPanel);
}
});
progressBarPanel = new JPanel();
progressBarPanel.setLayout(new BorderLayout());
progressBarPanel.setOpaque(false);
progressPanel = new JPanel();
progressPanel.setLayout(new BorderLayout());
progressPanel.setOpaque(false);
updateLabel = new JLabel(" ");
updateLabel.setFont(buttonFont);
@@ -176,11 +176,12 @@ class StatusPanel extends JPanel {
.addGroup(layout.createParallelGroup(GroupLayout.Alignment.CENTER)
.addComponent(installButton,
BUTTON_WIDTH, BUTTON_WIDTH, BUTTON_WIDTH)
.addComponent(progressBarPanel)
.addComponent(progressPanel)
.addComponent(updateLabel,
BUTTON_WIDTH, BUTTON_WIDTH, BUTTON_WIDTH)
.addComponent(updateButton)
.addComponent(removeButton)));
.addComponent(removeButton))
.addGap(16)); // make buttons line up relative to the scrollbar
layout.setVerticalGroup(layout
.createParallelGroup(GroupLayout.Alignment.LEADING)
@@ -189,14 +190,14 @@ class StatusPanel extends JPanel {
.addGroup(layout.createSequentialGroup()
.addComponent(installButton)
.addGroup(layout.createParallelGroup()
.addComponent(progressBarPanel)
.addComponent(progressPanel)
.addComponent(updateLabel))
.addComponent(updateButton).addComponent(removeButton)));
layout.linkSize(SwingConstants.HORIZONTAL, installButton, progressBarPanel,
updateButton, removeButton);
layout.linkSize(SwingConstants.HORIZONTAL,
installButton, progressPanel, updateButton, removeButton);
progressBarPanel.setVisible(false);
progressPanel.setVisible(false);
updateLabel.setVisible(false);
installButton.setEnabled(false);
@@ -204,7 +205,8 @@ class StatusPanel extends JPanel {
removeButton.setEnabled(false);
updateLabel.setVisible(true);
layout.setHonorsVisibility(updateLabel, false); // Makes the label take up space even though not visible
// Makes the label take up space even though not visible
layout.setHonorsVisibility(updateLabel, false);
validate();
}
@@ -235,7 +237,7 @@ class StatusPanel extends JPanel {
public void update(ContributionPanel panel) {
progressBarPanel.removeAll();
progressPanel.removeAll();
iconLabel.setIcon(panel.getContrib().isSpecial() ? foundationIcon : null);
label.setText(panel.description);
@@ -279,13 +281,13 @@ class StatusPanel extends JPanel {
removeButton.setEnabled(panel.getContrib().isInstalled()
&& !panel.removeInProgress);
progressBarPanel.add(panel.installProgressBar);
progressBarPanel.setVisible(false);
progressPanel.add(panel.installProgressBar);
progressPanel.setVisible(false);
updateLabel.setVisible(true);
if (panel.updateInProgress || panel.installInProgress || panel.removeInProgress) {
progressBarPanel.setVisible(true);
progressPanel.setVisible(true);
updateLabel.setVisible(false);
progressBarPanel.repaint();
progressPanel.repaint();
}
}
}
todo.txt
+12 -8
View File
@@ -43,6 +43,9 @@ X https://github.com/processing/processing/issues/3688
X use real version of bold font, rather than the fake version
X remove the "v" from the version numbers in the updates tab
X fix bold version used in the description below, when an item is selected
X manager needs a frame title
X remove tooltip that repeats the contents of the tab labels
X add extra space to the right of the buttons to line up w/ the scrollbar
watcher
X prevent re-prompting users when they say "no" to "sketch modified" message
@@ -127,7 +130,7 @@ _ also change the revision in the "about processing" dialog
_ https://github.com/processing/processing/issues/3665
gui/3 final
gui / 3.0 final
_ show hover text when the mouse is over the 'debug' button
_ show number of updates available in the footer
_ https://github.com/processing/processing/issues/3518
@@ -135,7 +138,7 @@ _ finish the gui
_ https://github.com/processing/processing/issues/3072
gui
gui / post 3.0
_ different design of squiggly line?
_ build custom scroll bar since the OS versions are so ugly?
_ error/warning location is awkward when no scroll bar is in use
@@ -159,23 +162,24 @@ _ https://github.com/processing/processing/issues/136
manager
_ Contributions Manager UI design
_ https://github.com/processing/processing/issues/3482
_ ArrayIndexOutOfBoundsException freak out when clicking the header line
_ think this was on name, with libraries, but not sure
_ needs a frame title
_ CM selected tabs are too tall
_ https://github.com/processing/processing/issues/3598
_ updates tab has ugly horizontal line at top
_ status/name/author table header is alternating color
_ area above scroll bar looks like more scroll bar
_ remove focus blue from the scrollable list
_ add extra space to the right of the buttons to line up w/ the scrollbar
_ scrolling "past" top/bottom causes the screen to jiggle (OS X and Trackpad)
_ looks like ContributionListing.getScrollableUnitIncrement() returns early
_ total number of updates available is not correct
_ Contributions Manager UI design
_ https://github.com/processing/processing/issues/3482
manager / post 3.0
_ Examples window closes and re-opens during library install/remove
_ https://github.com/processing/processing/issues/3304
_ ArrayIndexOutOfBoundsException freak out when clicking the header line
_ think this was on name, with libraries, but not sure
gui/low