mirror/Jailer
1
0
Fork 0
mirror of https://github.com/Wisser/Jailer.git synced 2026-05-24 11:39:31 -05:00
Code Issues Packages Projects Releases 105 Wiki Activity

render current search hit with border

Browse Source
This commit is contained in:
Ralf Wisser
2023-02-24 09:13:58 +01:00
parent 031980d594
commit fe91505d5a
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/gui/net/sf/jailer/ui/databrowser/BrowserContentPane.java
+1 -1
View File
@@ -1750,7 +1750,6 @@ public abstract class BrowserContentPane extends javax.swing.JPanel {
}
}
if (render instanceof JLabel) {
fullTextSearchPanel.markOccurrence((JLabel) render, column, row);
if (cellSelected) {
if (bgRow % 2 == 0) {
render.setBackground(UIUtil.TABLE_BG1SELECTED);
@@ -1758,6 +1757,7 @@ public abstract class BrowserContentPane extends javax.swing.JPanel {
render.setBackground(UIUtil.TABLE_BG2SELECTED);
}
}
render = fullTextSearchPanel.markOccurrence((JLabel) render, column, row);
}
return render;
}
src/main/gui/net/sf/jailer/ui/databrowser/FullTextSearchPanel.java
+22 -4
View File
@@ -18,6 +18,8 @@ package net.sf.jailer.ui.databrowser;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Insets;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.Toolkit;
@@ -33,11 +35,14 @@ import java.util.TreeMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JTable;
import javax.swing.SwingUtilities;
import javax.swing.border.Border;
import javax.swing.border.LineBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.DocumentEvent;
import javax.swing.event.DocumentListener;
@@ -465,9 +470,9 @@ public class FullTextSearchPanel extends javax.swing.JPanel {
table.repaint();
}
public void markOccurrence(JLabel render, int x, int y) {
public Component markOccurrence(JLabel render, int x, int y) {
if (inUpdate || !isVisible()) {
return;
return render;
}
String marked = markedValues.get(render.getText());
@@ -477,9 +482,22 @@ public class FullTextSearchPanel extends javax.swing.JPanel {
render.setBackground(new Color(190, 255, 180));
if (currentPosition != null && currentPosition == x + y * table.getColumnCount()) {
render.setBorder(BorderFactory.createLineBorder(new Color(0, 11 * 16, 0)));
JPanel panel = new JPanel(null) {
Border border = new LineBorder(new Color(0, 11 * 16, 0), 1, true);
@Override
public void paint(Graphics graphics) {
super.paint(graphics);
border.paintBorder(this, graphics, 0, 0, getWidth(), getHeight());
}
};
panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
panel.add(render);
return panel;
}
}
return render;
}
private void prev() {