Skip to content

UI bugfixes in Profile tab #36

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.

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
merged 1 commit into from
Feb 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.plan;

import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.treeStructure.treetable.TreeTableModel;
import com.intellij.util.ui.ColumnInfo;
import com.neueda.jetbrains.plugin.graphdb.database.api.query.GraphQueryPlan;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down Expand Up @@ -58,12 +56,6 @@ public Class<?> getColumnClass() {
public String valueOf(DefaultMutableTreeNode o) {
return ((GraphQueryPlan) o.getUserObject()).getOperatorType();
}

@Override
@NonNls
public String getPreferredStringValue() {
return StringUtil.repeatSymbol('m', 25);
}
};

private static final ColumnInfo<DefaultMutableTreeNode, String> ESTIMATED_ROWS_COL =
Expand All @@ -86,12 +78,6 @@ public String valueOf(DefaultMutableTreeNode o) {
.map(Object::toString)
.collect(joining(", "));
}

@Override
@NonNls
public String getPreferredStringValue() {
return StringUtil.repeatSymbol('m', 15);
}
};

private static final ColumnInfo<DefaultMutableTreeNode, String> IDENTIFIERS_COL =
Expand All @@ -102,12 +88,6 @@ public String valueOf(DefaultMutableTreeNode o) {
return ((GraphQueryPlan) o.getUserObject()).getIdentifiers().stream()
.collect(joining(", "));
}

@Override
@NonNls
public String getPreferredStringValue() {
return StringUtil.repeatSymbol('m', 12);
}
};

@NotNull
Expand All @@ -129,12 +109,6 @@ public String valueOf(DefaultMutableTreeNode o) {
})
.orElse("0");
}

@Override
@NonNls
public String getPreferredStringValue() {
return StringUtil.repeatSymbol('m', 5);
}
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.intellij.ui.treeStructure.treetable.TreeTableModel;
import com.neueda.jetbrains.plugin.graphdb.database.api.query.GraphQueryPlan;
import com.neueda.jetbrains.plugin.graphdb.database.api.query.GraphQueryResult;
import com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.table.ColumnResizer;
import com.neueda.jetbrains.plugin.graphdb.platform.ShouldNeverHappenException;
import org.jetbrains.annotations.NotNull;

Expand Down Expand Up @@ -59,6 +60,7 @@ public void initialize(Container container) {
treeTable.setAutoCreateColumnsFromModel(true);
treeTable.setRootVisible(true);
treeTable.setCellSelectionEnabled(false);
treeTable.setRowSelectionAllowed(true);
treeTable.setAutoResizeMode(TreeTableView.AUTO_RESIZE_OFF);

treeTable.getTree().setShowsRootHandles(true);
Expand All @@ -75,6 +77,8 @@ public void initialize(Container container) {
container.add(new JBScrollPane(treeTable, JBScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
JBScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED), BorderLayout.CENTER);
container.add(infoLabel, BorderLayout.SOUTH);

new ColumnResizer(treeTable).resize();
}

private void initTreeCellRenderer(ListTreeTableModelOnColumns model) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package com.neueda.jetbrains.plugin.graphdb.jetbrains.ui.console.table;

import javax.swing.*;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import javax.swing.table.TableColumnModel;
import java.awt.*;

public class ColumnResizer implements TableModelListener {

private final JTable table;
private final int minMargin;

public ColumnResizer(JTable table) {
this.table = table;
minMargin = strWidth("ww");
}

public void resize() {

int cols = table.getColumnCount();
int rows = table.getRowCount();
int margin = Math.max(table.getIntercellSpacing().width, minMargin);

TableColumnModel model = table.getColumnModel();

for (int c = 0; c < cols; c++) {
TableColumn col = model.getColumn(c);
String header = String.valueOf(col.getHeaderValue());
int headerWidth = strWidth(header) + margin;

for (int r = 0; r < rows; r++) {
TableCellRenderer render = table.getCellRenderer(r, c);
Component component = table.prepareRenderer(render, r, c);
int rendererWidth = component.getPreferredSize().width;

int cellWidth = Math.max(rendererWidth + margin, 1);

col.setPreferredWidth(Math.max(headerWidth, cellWidth));
}
}
}

private int strWidth(String str) {
return table.getFontMetrics(table.getFont())
.charsWidth(str.toCharArray(), 0, str.length());
}

@Override
public void tableChanged(TableModelEvent e) {
resize();
}

}