gered/Llanfair
Archived
1
0
Fork 0
Code Issues 9 Pull requests Packages Projects Releases 5 Wiki Activity

fix bug with the way visibility for title and goal was determined

Browse source
This commit is contained in:
Gered 2015-12-03 19:01:55 -05:00
parent 57e38a58b1
commit d5d82a9a5e
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/org/fenix/llanfair/gui/RunPane.java
View file

@ -240,7 +240,7 @@ public class RunPane extends JPanel {
} else if (Settings.footerDisplay.equals(property)) { } else if (Settings.footerDisplay.equals(property)) {
updateVisibility(FOOTER); updateVisibility(FOOTER);
} else if (Settings.headerShowTitle.equals(property)) { } else if (Settings.headerShowTitle.equals(property)) {
updateVisibility(GOAL); updateVisibility(TITLE | GOAL);
updateValues(SEPARATOR); updateValues(SEPARATOR);
} else if (Settings.headerShowGoal.equals(property)) { } else if (Settings.headerShowGoal.equals(property)) {
updateVisibility(TITLE | GOAL); updateVisibility(TITLE | GOAL);
@ -286,12 +286,12 @@ public class RunPane extends JPanel {
* Places the sub-components within this component. * Places the sub-components within this component.
*/ */
private void placeComponents() { private void placeComponents() {
add(title,GBC.grid(0, 0).insets(3, 0, 1, 0));
goalPane = new JPanel(new GridBagLayout()); { goalPane = new JPanel(new GridBagLayout()); {
goalPane.add(goalText, GBC.grid(0, 0)); goalPane.add(goalText, GBC.grid(0, 1));
goalPane.add(goal, GBC.grid(1, 0).insets(0, 3, 0, 0)); goalPane.add(goal, GBC.grid(1, 1).insets(0, 3, 0, 0));
goalPane.setOpaque(false); goalPane.setOpaque(false);
} }
add(title,GBC.grid(0, 0).insets(3, 0, 1, 0));
add(createSeparator(), GBC.grid(0, 2).insets(3, 0).fill(GBC.H)); add(createSeparator(), GBC.grid(0, 2).insets(3, 0).fill(GBC.H));
add(history, GBC.grid(0, 3).fill(GBC.H).insets(0, 5)); add(history, GBC.grid(0, 3).fill(GBC.H).insets(0, 5));
add(createSeparator(), GBC.grid(0, 4).insets(3, 0).fill(GBC.H)); add(createSeparator(), GBC.grid(0, 4).insets(3, 0).fill(GBC.H));
@ -387,8 +387,8 @@ public class RunPane extends JPanel {
} }
} }
if ((identifier & GOAL) == GOAL) { if ((identifier & GOAL) == GOAL) {
if (Settings.headerShowTitle.get()) { if (Settings.headerShowGoal.get()) {
if (Settings.headerShowGoal.get()) { if (Settings.headerShowTitle.get()) {
add(goalPane, GBC.grid(0, 1)); add(goalPane, GBC.grid(0, 1));
} else { } else {
add(goalPane, GBC.grid(0, 1).insets(3, 0, 0, 0)); add(goalPane, GBC.grid(0, 1).insets(3, 0, 0, 0));
@ -398,7 +398,7 @@ public class RunPane extends JPanel {
} }
} }
if ((identifier & TITLE) == TITLE) { if ((identifier & TITLE) == TITLE) {
title.setVisible(Settings.headerShowGoal.get()); title.setVisible(Settings.headerShowTitle.get());
} }
revalidate(); revalidate();
repaint(); repaint();