From 9b67d4bb7c1e1040c8250b3a0dfda05b8421d85f Mon Sep 17 00:00:00 2001
From: "Anders H. Rebner" <anderhre@stud.ntnu.no>
Date: Tue, 31 Mar 2020 08:32:48 +0200
Subject: [PATCH] #86 Endring i resize-funksjon
---
soitool/modules/module_authentification_board.py | 5 ++---
soitool/modules/module_base.py | 3 ++-
soitool/modules/module_table.py | 5 ++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/soitool/modules/module_authentification_board.py b/soitool/modules/module_authentification_board.py
index f8e3de3..77d383c 100644
--- a/soitool/modules/module_authentification_board.py
+++ b/soitool/modules/module_authentification_board.py
@@ -6,7 +6,7 @@ from PySide2 import QtGui
from PySide2.QtCore import Qt
from soitool.modules.module_base import (
ModuleBase,
- set_table_size,
+ resize_table,
get_table_size,
)
@@ -241,8 +241,7 @@ class AuthentificationBoardModule(ModuleBase, QTableWidget, metaclass=Meta):
def resize(self):
"""Resize widget and rows."""
- self.resizeRowsToContents()
- set_table_size(self)
+ resize_table(self)
def get_size(self):
"""Get size of widget."""
diff --git a/soitool/modules/module_base.py b/soitool/modules/module_base.py
index 7ebbabe..3763129 100644
--- a/soitool/modules/module_base.py
+++ b/soitool/modules/module_base.py
@@ -38,7 +38,7 @@ class ModuleBase(ABC):
raise NotImplementedError
-def set_table_size(widget):
+def resize_table(widget):
"""Calculate and set the size of a QTableWidget.
Parameters
@@ -55,6 +55,7 @@ def set_table_size(widget):
for y in range(widget.rowCount()):
height += widget.rowHeight(y) + 0.5
+ widget.resizeRowsToContents()
widget.setFixedWidth(width)
widget.setFixedHeight(height)
diff --git a/soitool/modules/module_table.py b/soitool/modules/module_table.py
index e8d1022..64ed5e4 100644
--- a/soitool/modules/module_table.py
+++ b/soitool/modules/module_table.py
@@ -3,7 +3,7 @@ from PySide2.QtWidgets import QTableWidget, QTableWidgetItem
from PySide2 import QtGui, QtCore
from soitool.modules.module_base import (
ModuleBase,
- set_table_size,
+ resize_table,
get_table_size,
)
@@ -159,8 +159,7 @@ class TableModule(ModuleBase, QTableWidget, metaclass=Meta):
Resize rows and columns to contents.
"""
self.resizeColumnsToContents()
- self.resizeRowsToContents()
- set_table_size(self)
+ resize_table(self)
def get_size(self):
"""Get size of widget."""
--
GitLab