MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[log] IDEA-115675 IDEA-116040 Fix table columns sizing

Browse Source 
* Set sizes of table columns once, after the actual TableModel with
  commits is applied to the table. Don't set sizes again afterwards.
* Don't hardcode sizes:
  - let commit column occupy as much as possible;
  - let author column be as wide as the longest person name among the
    recent commits;
  - let the date be as wide as needed (no need to calculate,
    because dates are always nearly the same).

Implemented with the great help of Vassiliy Kudryashov.
This commit is contained in:
Kirill Likhodedov
2013-12-09 15:18:28 +04:00
parent 6730feff4c
commit 805b67cd07
2 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/VcsLogUI.java
-1
View File
@@ -90,7 +90,6 @@ public class VcsLogUI {
UIUtil.invokeLaterIfNeeded(new Runnable() {
@Override
public void run() {
myMainFrame.getGraphTable().setPreferredColumnWidths();
myMainFrame.getGraphTable().repaint();
}
});
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/VcsLogGraphTable.java
+53 -18
View File
@@ -12,6 +12,7 @@ import com.intellij.ui.JBColor;
import com.intellij.ui.PopupHandler;
import com.intellij.ui.table.JBTable;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.text.DateFormatUtil;
import com.intellij.util.ui.UIUtil;
import com.intellij.vcs.log.Hash;
import com.intellij.vcs.log.data.VcsLogDataHolder;
@@ -30,14 +31,12 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.event.*;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableModel;
import javax.swing.table.*;
import java.awt.*;
import java.awt.datatransfer.StringSelection;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Date;
import java.util.List;
import static com.intellij.vcs.log.graph.render.PrintParameters.HEIGHT_CELL;
@@ -49,11 +48,13 @@ public class VcsLogGraphTable extends JBTable implements TypeSafeDataProvider, C
private static final Logger LOG = Logger.getInstance(VcsLogGraphTable.class);
private static final int ROOT_INDICATOR_WIDTH = 5;
private static final int MAX_DEFAULT_AUTHOR_COLUMN_WIDTH = 200;
@NotNull private final VcsLogUI myUI;
@NotNull private final GraphCellPainter myGraphPainter;
private volatile boolean myRepaintFreezed;
private boolean myColumnsSizeInitialized = false;
private volatile boolean myRepaintFreezed;
public VcsLogGraphTable(@NotNull VcsLogUI UI, final VcsLogDataHolder logDataHolder) {
super();
@@ -112,6 +113,53 @@ public class VcsLogGraphTable extends JBTable implements TypeSafeDataProvider, C
});
}
@Override
public void setModel(TableModel model) {
super.setModel(model);
// initialize sizes once, when the real model is set (not from the constructor).
if (!myColumnsSizeInitialized && !(model instanceof DefaultTableModel)) {
myColumnsSizeInitialized = true;
setColumnPreferredSize();
setAutoCreateColumnsFromModel(false); // otherwise sizes are recalculated after each TableColumn re-initialization
}
}
private void setColumnPreferredSize() {
for (int i = 0; i < getColumnCount(); i++) {
TableColumn column = getColumnModel().getColumn(i);
if (i == AbstractVcsLogTableModel.ROOT_COLUMN) { // thin stripe or nothing
int rootWidth = myUI.getColorManager().isMultipleRoots() ? ROOT_INDICATOR_WIDTH : 0;
// NB: all further instructions and their order are important, otherwise the minimum size which is less than 15 won't be applied
column.setMinWidth(rootWidth);
column.setMaxWidth(rootWidth);
column.setPreferredWidth(rootWidth);
}
else if (i == AbstractVcsLogTableModel.COMMIT_COLUMN) { // let commit message occupy as much as possible
column.setPreferredWidth(Short.MAX_VALUE);
}
else if (i == AbstractVcsLogTableModel.AUTHOR_COLUMN) { // detect author with the longest name
int contentWidth = calcMaxContentColumnWidth(i, 1000);
column.setMinWidth(Math.min(contentWidth, MAX_DEFAULT_AUTHOR_COLUMN_WIDTH));
column.setWidth(column.getMinWidth());
}
else if (i == AbstractVcsLogTableModel.DATE_COLUMN) { // all dates have nearly equal sizes
Font tableFont = UIManager.getFont("Table.font");
column.setMinWidth(getFontMetrics(tableFont).stringWidth("mm" + DateFormatUtil.formatDateTime(new Date())));
column.setWidth(column.getMinWidth());
}
}
}
private int calcMaxContentColumnWidth(int columnIndex, int maxRowsToCheck) {
int maxWidth = 0;
for (int row = 0; row < maxRowsToCheck && row < getRowCount(); row++) {
TableCellRenderer renderer = getCellRenderer(row, columnIndex);
Component comp = prepareRenderer(renderer, row, columnIndex);
maxWidth = Math.max(comp.getPreferredSize().width, maxWidth);
}
return maxWidth + UIUtil.DEFAULT_HGAP;
}
@Override
public String getToolTipText(@NotNull MouseEvent event) {
int row = rowAtPoint(event.getPoint());
@@ -128,19 +176,6 @@ public class VcsLogGraphTable extends JBTable implements TypeSafeDataProvider, C
return null;
}
public void setPreferredColumnWidths() {
TableColumn rootColumn = getColumnModel().getColumn(AbstractVcsLogTableModel.ROOT_COLUMN);
int rootWidth = myUI.getColorManager().isMultipleRoots() ? ROOT_INDICATOR_WIDTH : 0;
// NB: all further instructions and their order are important, otherwise the minimum size which is less than 15 won't be applied
rootColumn.setMinWidth(rootWidth);
rootColumn.setMaxWidth(rootWidth);
rootColumn.setPreferredWidth(rootWidth);
getColumnModel().getColumn(AbstractVcsLogTableModel.COMMIT_COLUMN).setPreferredWidth(700);
getColumnModel().getColumn(AbstractVcsLogTableModel.AUTHOR_COLUMN).setMinWidth(90);
getColumnModel().getColumn(AbstractVcsLogTableModel.DATE_COLUMN).setMinWidth(90);
}
public void jumpToRow(int rowIndex) {
scrollRectToVisible(getCellRect(rowIndex, 0, false));
setRowSelectionInterval(rowIndex, rowIndex);