From efb02f633c3c752ae57cfffbda002b61ca3e4293 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 27 Apr 2015 23:13:00 +0200 Subject: [PATCH] Fixed handling of default columns width. --- .../java/mage/client/table/TablesPanel.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index 44eb319f89c..a302664d68c 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -1199,17 +1199,14 @@ class TableTableModel extends AbstractTableModel { // set the column width from saved value or defaults int[] widths = Util.getIntArrayFromString(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_TABLES_COLUMNS_WIDTH, null)); - if (widths != null) { - int lengthW = widths.length; - int i = 0; - for (int width : defaultColumnsWidth) { - if (lengthW > i) { - width = widths[i]; - } - TableColumn column = table.getColumnModel().getColumn(i++); - column.setWidth(width); - column.setPreferredWidth(width); - } + int i = 0; + for (int width : defaultColumnsWidth) { + if (widths != null && widths.length > i) { + width = widths[i]; + } + TableColumn column = table.getColumnModel().getColumn(i++); + column.setWidth(width); + column.setPreferredWidth(width); } // set the column order