git://git.nikiroo.be
/
fanfix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a033726
)
GUI: search: show all tag bars
author
Niki Roo
<niki@nikiroo.be>
Wed, 17 Apr 2019 16:39:58 +0000
(18:39 +0200)
committer
Niki Roo
<niki@nikiroo.be>
Wed, 17 Apr 2019 16:39:58 +0000
(18:39 +0200)
src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
patch
|
blob
|
blame
|
history
diff --git
a/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
b/src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
index 172f0fa822f379de921988608f65016ddf5ad83c..0046e89e4ad375671de88cae65f9d6eb85dc0fb8 100644
(file)
--- a/
src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
+++ b/
src/be/nikiroo/fanfix/reader/ui/GuiReaderSearch.java
@@
-202,6
+202,7
@@
public class GuiReaderSearch extends JFrame {
}
}
}
}
+ // update and reset the tagsbar
// can be NULL, for base tags
private void updateTags(final SearchableTag tag) {
final List<SearchableTag> parents = new ArrayList<SearchableTag>();
// can be NULL, for base tags
private void updateTags(final SearchableTag tag) {
final List<SearchableTag> parents = new ArrayList<SearchableTag>();
@@
-220,15
+221,21
@@
public class GuiReaderSearch extends JFrame {
// TODO: Slow UI
// TODO: select the right one
try {
// TODO: Slow UI
// TODO: select the right one
try {
+ SearchableTag selectedChild = parents.isEmpty() ? null
+ : parents.get(parents.size() - 1);
addTagBar(BasicSearchable.getSearchable(supportType)
addTagBar(BasicSearchable.getSearchable(supportType)
- .getTags(),
tag
);
+ .getTags(),
selectedChild
);
} catch (IOException e) {
error(e);
}
for (int i = parents.size() - 1; i >= 0; i--) {
} catch (IOException e) {
error(e);
}
for (int i = parents.size() - 1; i >= 0; i--) {
+ SearchableTag selectedChild = null;
+ if (i > 0) {
+ selectedChild = parents.get(i - 1);
+ }
SearchableTag parent = parents.get(i);
SearchableTag parent = parents.get(i);
- addTagBar(parent.getChildren(),
parent
);
+ addTagBar(parent.getChildren(),
selectedChild
);
}
tagBars.validate();
}
tagBars.validate();
@@
-247,6
+254,8
@@
public class GuiReaderSearch extends JFrame {
});
}
});
}
+ // not 1.6 compatible
+ @SuppressWarnings({ "unchecked", "rawtypes" })
private void addTagBar(List<SearchableTag> tags,
final SearchableTag selected) {
tags.add(0, null);
private void addTagBar(List<SearchableTag> tags,
final SearchableTag selected) {
tags.add(0, null);
@@
-259,13
+268,13
@@
public class GuiReaderSearch extends JFrame {
combo.setRenderer(new ListCellRenderer() {
@Override
combo.setRenderer(new ListCellRenderer() {
@Override
- public Component getListCellRendererComponent(
-
JList list, Object value
,
-
int index, boolean isSelected,
boolean cellHasFocus) {
+ public Component getListCellRendererComponent(
JList list,
+
Object value, int index, boolean isSelected
,
+ boolean cellHasFocus) {
Object displayValue = value;
if (value instanceof SearchableTag) {
Object displayValue = value;
if (value instanceof SearchableTag) {
- displayValue = ((SearchableTag)value).getName();
+ displayValue = ((SearchableTag)
value).getName();
} else {
displayValue = "Select a tag...";
cellHasFocus = false;
} else {
displayValue = "Select a tag...";
cellHasFocus = false;