Skip to content

Fix task monitor window layout#89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ctrueden merged 2 commits into from
Apr 2, 2026
Merged

Fix task monitor window layout #89

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11987eb
With layout color being ignored in task monitor component.
NicoKiaru Mar 29, 2026
182c3c4
Task monitor swing component improvement:
NicoKiaru Mar 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions src/main/java/org/scijava/ui/swing/task/SwingTaskMonitorComponent.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,6 @@
import org.scijava.task.Task;
import org.scijava.task.event.TaskEvent;

import javax.swing.Icon;
import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
Expand All@@ -44,13 +43,12 @@
import javax.swing.JScrollPane;
import javax.swing.JTable;
import javax.swing.SwingConstants;
import javax.swing.UIManager;
import javax.swing.border.EmptyBorder;
import javax.swing.plaf.basic.BasicProgressBarUI;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellRenderer;
import java.awt.BorderLayout;
import java.awt.Color;

import java.awt.Component;
import java.awt.Dimension;
import java.awt.Graphics;
Expand DownExpand Up@@ -148,6 +146,8 @@ public class SwingTaskMonitorComponent {
*/
private double globalProgression = 0;

private boolean rowHeightInitialized = false;

/**
* Constructs a Swing Task Monitor component - clickable circular progress bar
* the component can be accessed with
Expand DownExpand Up@@ -200,7 +200,6 @@ public void mouseClicked(MouseEvent e) {
taskFrame = new JFrame("Tasks");
if (undecorated) {
taskFrame.setUndecorated(true);
taskFrame.setBackground(new Color(1.0f, 1.0f, 1.0f, 0.0f));
}

// taskTable showing all tasks, contained in taskFrame
Expand All@@ -209,7 +208,6 @@ public void mouseClicked(MouseEvent e) {
taskTable.setShowGrid(false);
taskTable.setIntercellSpacing(new Dimension(0, 0));
taskTable.setTableHeader(null); // no header
taskTable.setRowHeight(65);
taskTable.setRowMargin(2);
taskTable.setDefaultRenderer(Task.class, new TaskRenderer(false));
// restrict size of second column to the size of the stop icon
Expand DownExpand Up@@ -266,6 +264,12 @@ private void onEvent(final TaskEvent evt) {
} else {
taskTableModel.addOrUpdate(task);
}
if (!rowHeightInitialized) {
rowHeightInitialized = true;
TableCellRenderer renderer = taskTable.getDefaultRenderer(Task.class);
Component c = renderer.getTableCellRendererComponent(taskTable, task, false, false, 0, 0);
taskTable.setRowHeight(c.getPreferredSize().height + taskTable.getRowMargin());
}
// globalProgression has been updated during taskTableModel update
globalProgressBar.setValue((int)(globalProgression*100));
}
Expand DownExpand Up@@ -484,8 +488,7 @@ class TaskRenderer implements TableCellRenderer {
JLabel labelTop = new JLabel(); // top label : task name and status
JProgressBar progressBar = new JProgressBar(); // standard linear progress bar
JLabel labelBottom = new JLabel(); // bottom label : task completion, and optionally time left
Icon errorIcon = UIManager.getIcon("OptionPane.errorIcon"); // icon for canceling task
JLabel cancelTask; // container for errorIcon
JLabel cancelTask; // cancel icon

public TaskRenderer(boolean isBordered) {
labelTop.setVerticalTextPosition(SwingConstants.TOP);
Expand All@@ -498,16 +501,22 @@ public TaskRenderer(boolean isBordered) {
cell.add(labelTop,"height ::14, span");
cell.add(progressBar,"height ::3, span");
cell.add(labelBottom, "height ::14");
cancelTask = new JLabel(errorIcon, SwingConstants.CENTER);
cancelTask = new JLabel("\u2715", SwingConstants.CENTER);
cancelTask.setOpaque(true);
cancelTask.setBackground(cell.getBackground());
}

@Override
public Component getTableCellRendererComponent(
JTable table, Object tk,
boolean isSelected, boolean hasFocus,
int row, int column) {
// Pick up LaF colors from the table
cell.setBackground(table.getBackground());
cell.setForeground(table.getForeground());
labelTop.setForeground(table.getForeground());
labelBottom.setForeground(table.getForeground());
cancelTask.setBackground(table.getBackground());
cancelTask.setForeground(table.getForeground());
if (column==1) {
return cancelTask; // second column : stop icon
}
Expand Down
Loading