git://git.nikiroo.be
/
fanfix.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit '9b75402fd752653f27158f1c1775a062672c7b27'
[fanfix.git]
/
ui
/
NavBar.java
diff --git
a/ui/NavBar.java
b/ui/NavBar.java
index eb4ba4faaad1a95abf4165cf12c9b582d67fc8d8..e99115c329ede86d6cd7919618d6b0346134d39e 100644
(file)
--- a/
ui/NavBar.java
+++ b/
ui/NavBar.java
@@
-80,7
+80,10
@@
public class NavBar extends ListenerPanel {
});
page = new JTextField(Integer.toString(min));
});
page = new JTextField(Integer.toString(min));
- page.setPreferredSize(new Dimension(page.getPreferredSize().width * 2,
+ page.setPreferredSize(
+ new Dimension(new JButton("1234").getPreferredSize().width,
+ new JButton("dummy").getPreferredSize().height));
+ page.setMaximumSize(new Dimension(Integer.MAX_VALUE,
page.getPreferredSize().height));
page.addActionListener(new ActionListener() {
@Override
page.getPreferredSize().height));
page.addActionListener(new ActionListener() {
@Override
@@
-99,7
+102,7
@@
public class NavBar extends ListenerPanel {
}
});
}
});
- maxPage = new JLabel("
of " + max + " "
);
+ maxPage = new JLabel("
of " + max
);
next = new JButton();
next.addActionListener(new ActionListener() {
next = new JButton();
next.addActionListener(new ActionListener() {
@@
-122,13
+125,15
@@
public class NavBar extends ListenerPanel {
this.add(first);
this.add(previous);
this.add(first);
this.add(previous);
+ this.add(new JLabel(" "));
this.add(page);
this.add(page);
+ this.add(new JLabel(" "));
this.add(maxPage);
this.add(maxPage);
+ this.add(new JLabel(" "));
this.add(next);
this.add(last);
this.add(next);
this.add(last);
- label = new JLabel("");
- this.add(label);
+ this.add(label = new JLabel(""));
this.min = min;
this.max = max;
this.min = min;
this.max = max;
@@
-234,7
+239,7
@@
public class NavBar extends ListenerPanel {
index = max;
}
index = max;
}
- maxPage.setText("
of " + max + " "
);
+ maxPage.setText("
of " + max
);
updateEnabled();
updateLabel();
}
updateEnabled();
updateLabel();
}