summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-10-24 13:09:14 -0400
committerBernard Normier <bernard@zeroc.com>2012-10-24 13:09:14 -0400
commit2992fdbc91c2f10208f6e3b8bc1bfc5ad1e855c3 (patch)
tree00b8aec131f3f084d79afa4ce86c7a4bc45164b7 /java/src
parentFixed regex ifdef/ndef code. (diff)
downloadice-2992fdbc91c2f10208f6e3b8bc1bfc5ad1e855c3.tar.bz2
ice-2992fdbc91c2f10208f6e3b8bc1bfc5ad1e855c3.tar.xz
ice-2992fdbc91c2f10208f6e3b8bc1bfc5ad1e855c3.zip
More JTable rowHeight for larger fonts
Diffstat (limited to 'java/src')
-rw-r--r--java/src/IceGridGUI/LiveDeployment/GraphView.java12
-rw-r--r--java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java32
2 files changed, 42 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/LiveDeployment/GraphView.java
index 7e899d09c35..c65f7cf3199 100644
--- a/java/src/IceGridGUI/LiveDeployment/GraphView.java
+++ b/java/src/IceGridGUI/LiveDeployment/GraphView.java
@@ -575,7 +575,17 @@ public class GraphView extends JFrame implements MetricsFieldContext
}
}
};
-
+
+ //
+ // Adjust row height for larger fonts
+ //
+ int fontSize = _legendTable.getFont().getSize();
+ int minRowHeight = fontSize + fontSize / 3;
+ if(_legendTable.getRowHeight() < minRowHeight)
+ {
+ _legendTable.setRowHeight(minRowHeight);
+ }
+
//
// Graph preferences.
//
diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java
index 4fb4b3a6086..e144ffba9eb 100644
--- a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java
+++ b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java
@@ -672,6 +672,16 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
}
};
+ //
+ // Adjust row height for larger fonts
+ //
+ int fontSize = table.getFont().getSize();
+ int minRowHeight = fontSize + fontSize / 3;
+ if(table.getRowHeight() < minRowHeight)
+ {
+ table.setRowHeight(minRowHeight);
+ }
+
table.setDragEnabled(true);
table.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
table.setCellSelectionEnabled(true);
@@ -1422,6 +1432,16 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
model.addColumn("Identity");
final JTable table = new JTable(model);
+ //
+ // Adjust row height for larger fonts
+ //
+ int fontSize = table.getFont().getSize();
+ int minRowHeight = fontSize + fontSize / 3;
+ if(table.getRowHeight() < minRowHeight)
+ {
+ table.setRowHeight(minRowHeight);
+ }
+
table.setPreferredSize(new Dimension(550, 200));
table.setPreferredScrollableViewportSize(table.getPreferredSize());
@@ -1603,7 +1623,17 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext
};
table.addMouseListener(new ButtonMouseListener(table));
table.setAutoCreateRowSorter(true);
-
+
+ //
+ // Adjust row height for larger fonts
+ //
+ int fontSize = table.getFont().getSize();
+ int minRowHeight = fontSize + fontSize / 3;
+ if(table.getRowHeight() < minRowHeight)
+ {
+ table.setRowHeight(minRowHeight);
+ }
+
for(Map.Entry<Integer, MetricsField> fieldEntry : model.getMetricFields().entrySet())
{
if(fieldEntry.getValue().getCellRenderer() != null)