diff options
| -rw-r--r-- | java/src/IceGridGUI/Application/ArrayMapField.java | 10 | ||||
| -rw-r--r-- | java/src/IceGridGUI/Application/ParameterValuesField.java | 10 | ||||
| -rw-r--r-- | java/src/IceGridGUI/Application/ParametersField.java | 10 | ||||
| -rw-r--r-- | java/src/IceGridGUI/Application/PropertiesField.java | 10 | ||||
| -rw-r--r-- | java/src/IceGridGUI/Application/SimpleMapField.java | 10 | ||||
| -rw-r--r-- | java/src/IceGridGUI/LiveDeployment/TableField.java | 11 | ||||
| -rw-r--r-- | java/src/IceGridGUI/Main.java | 2 |
7 files changed, 62 insertions, 1 deletions
diff --git a/java/src/IceGridGUI/Application/ArrayMapField.java b/java/src/IceGridGUI/Application/ArrayMapField.java index 6f228222f09..464b6fb0e53 100644 --- a/java/src/IceGridGUI/Application/ArrayMapField.java +++ b/java/src/IceGridGUI/Application/ArrayMapField.java @@ -45,6 +45,16 @@ public class ArrayMapField extends JTable assert _vectorSize > 2; + // + // Adjust row height for larger fonts + // + int fontSize = getFont().getSize(); + int minRowHeight = fontSize + fontSize / 3; + if(rowHeight < minRowHeight) + { + setRowHeight(minRowHeight); + } + Action deleteRow = new AbstractAction("Delete selected row(s)") { public void actionPerformed(ActionEvent e) diff --git a/java/src/IceGridGUI/Application/ParameterValuesField.java b/java/src/IceGridGUI/Application/ParameterValuesField.java index 81485a52b0e..1d0843f66f9 100644 --- a/java/src/IceGridGUI/Application/ParameterValuesField.java +++ b/java/src/IceGridGUI/Application/ParameterValuesField.java @@ -44,6 +44,16 @@ public class ParameterValuesField extends JTable _useDefaultCombo.setEditable(true); _notSetCombo.setEditable(true); + + // + // Adjust row height for larger fonts + // + int fontSize = getFont().getSize(); + int minRowHeight = fontSize + fontSize / 3; + if(rowHeight < minRowHeight) + { + setRowHeight(minRowHeight); + } } public void set(java.util.List<String> names, diff --git a/java/src/IceGridGUI/Application/ParametersField.java b/java/src/IceGridGUI/Application/ParametersField.java index f122a3582b1..6abbccd0a48 100644 --- a/java/src/IceGridGUI/Application/ParametersField.java +++ b/java/src/IceGridGUI/Application/ParametersField.java @@ -46,6 +46,16 @@ public class ParametersField extends JTable comboBox.setEditable(true); _cellEditor = new DefaultCellEditor(comboBox); + // + // Adjust row height for larger fonts + // + int fontSize = getFont().getSize(); + int minRowHeight = fontSize + fontSize / 3; + if(rowHeight < minRowHeight) + { + setRowHeight(minRowHeight); + } + Action deleteRow = new AbstractAction("Delete selected row(s)") { public void actionPerformed(ActionEvent e) diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/Application/PropertiesField.java index 6c6579835d5..c76356015b0 100644 --- a/java/src/IceGridGUI/Application/PropertiesField.java +++ b/java/src/IceGridGUI/Application/PropertiesField.java @@ -39,6 +39,16 @@ public class PropertiesField extends JTable _editor = editor; + // + // Adjust row height for larger fonts + // + int fontSize = getFont().getSize(); + int minRowHeight = fontSize + fontSize / 3; + if(rowHeight < minRowHeight) + { + setRowHeight(minRowHeight); + } + Action deleteRow = new AbstractAction("Delete selected row(s)") { public void actionPerformed(ActionEvent e) diff --git a/java/src/IceGridGUI/Application/SimpleMapField.java b/java/src/IceGridGUI/Application/SimpleMapField.java index 2a2b1f596cd..9bf3dd9f661 100644 --- a/java/src/IceGridGUI/Application/SimpleMapField.java +++ b/java/src/IceGridGUI/Application/SimpleMapField.java @@ -40,6 +40,16 @@ public class SimpleMapField extends JTable _columnNames.add(headKey); _columnNames.add(headValue); + // + // Adjust row height for larger fonts + // + int fontSize = getFont().getSize(); + int minRowHeight = fontSize + fontSize / 3; + if(rowHeight < minRowHeight) + { + setRowHeight(minRowHeight); + } + Action deleteRow = new AbstractAction("Delete selected row(s)") { public void actionPerformed(ActionEvent e) diff --git a/java/src/IceGridGUI/LiveDeployment/TableField.java b/java/src/IceGridGUI/LiveDeployment/TableField.java index d1c17e51703..07047692225 100644 --- a/java/src/IceGridGUI/LiveDeployment/TableField.java +++ b/java/src/IceGridGUI/LiveDeployment/TableField.java @@ -38,6 +38,17 @@ public class TableField extends JTable { _columnNames.add(name); } + + // + // Adjust row height for larger fonts + // + int fontSize = getFont().getSize(); + int minRowHeight = fontSize + fontSize / 3; + if(rowHeight < minRowHeight) + { + setRowHeight(minRowHeight); + } + init(); } diff --git a/java/src/IceGridGUI/Main.java b/java/src/IceGridGUI/Main.java index 28153c479ef..6800e4eb7db 100644 --- a/java/src/IceGridGUI/Main.java +++ b/java/src/IceGridGUI/Main.java @@ -73,7 +73,7 @@ public class Main extends JFrame } else // JGoodies L&F { - UIManager.setLookAndFeel("com.jgoodies.looks.plastic.PlasticXPLookAndFeel"); + UIManager.setLookAndFeel("com.jgoodies.looks.plastic.PlasticLookAndFeel"); } } catch(Exception e) |