[client] Set table row height according to scaling

- prevent rescaling for every TableCellRenderer call

Issue: #3794

2 files changed, 8 insertions, 0 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
index 77203d50..5884598c 100755
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/App.java
@@ -20,6 +20,7 @@ import javax.net.ssl.SSLContext;
 import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
+import javax.swing.table.TableCellRenderer;
 
 import org.apache.log4j.AppenderSkeleton;
 import org.apache.log4j.BasicConfigurator;
@@ -314,9 +315,12 @@ public class App {
 					if (containerEvent.getID() == ContainerEvent.COMPONENT_ADDED) {
 						Font font = containerEvent.getChild().getFont();
 						if (font != null && font.getSize2D() <= defaultSize) {
+							// Do not update font in tables on every renderer call to prevent weirdness.
+							if (!(containerEvent.getChild() instanceof TableCellRenderer)){
 							containerEvent.getChild().setFont(
 									new Font(font.getName(), font.getStyle(), Math.round(font.getSize2D()
 											* scaling)));
+							}
 						}
 					}
 				}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java
index 47062258..cd1ed7b5 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/table/ListTable.java
@@ -1,6 +1,7 @@
 package org.openslx.dozmod.gui.control.table;
 
 import java.awt.Component;
+import java.awt.Font;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -20,6 +21,7 @@ import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
 import javax.swing.table.TableRowSorter;
 
+import org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.helper.TableColumnAdjuster;
 
 @SuppressWarnings("serial")
@@ -71,6 +73,8 @@ public abstract class ListTable<T> extends JTable {
 		this.setDefaultEditor(Boolean.class, getDefaultEditor(Boolean.class));
 		this.setRowSelectionAllowed(true);
 		this.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+		this.setRowHeight(this.getRowHeight() * Config.getFontScaling() / 100);
+		
 		sorter.addRowSorterListener(new RowSorterListener() {
 			@Override
 			public void sorterChanged(RowSorterEvent e) {