diff --git a/qt/aqt/browser/table/table.py b/qt/aqt/browser/table/table.py index 242f7a027..b72a38c6e 100644 --- a/qt/aqt/browser/table/table.py +++ b/qt/aqt/browser/table/table.py @@ -348,20 +348,10 @@ class Table: self._view.setWordWrap(False) self._view.setHorizontalScrollMode(QAbstractItemView.ScrollMode.ScrollPerPixel) self._view.horizontalScrollBar().setSingleStep(10) - self._update_font() + self._view.verticalHeader().setDefaultSectionSize(12 + 2 * self.browser.mw.pm.browser_row_height()) self._view.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) qconnect(self._view.customContextMenuRequested, self._on_context_menu) - def _update_font(self) -> None: - # we can't choose different line heights efficiently, so we need - # to pick a line height big enough for any card template - curmax = 16 - for m in self.col.models.all(): - for t in m["tmpls"]: - bsize = t.get("bsize", 0) - if bsize > curmax: - curmax = bsize - self._view.verticalHeader().setDefaultSectionSize(curmax + 6) def _setup_headers(self) -> None: vh = self._view.verticalHeader() diff --git a/qt/aqt/clayout.py b/qt/aqt/clayout.py index 1df0b27cd..448a06596 100644 --- a/qt/aqt/clayout.py +++ b/qt/aqt/clayout.py @@ -748,7 +748,6 @@ class CardLayout(QDialog): if t.get("bfont"): f.overrideFont.setChecked(True) f.font.setCurrentFont(QFont(t.get("bfont") or "Arial")) - f.fontSize.setValue(t.get("bsize") or 12) qconnect(f.buttonBox.accepted, lambda: self.onBrowserDisplayOk(f)) d.exec() @@ -759,8 +758,8 @@ class CardLayout(QDialog): t["bafmt"] = f.afmt.text().strip() if f.overrideFont.isChecked(): t["bfont"] = f.font.currentFont().family() - t["bsize"] = f.fontSize.value() else: + # keep bsize for legacy notetypes for key in ("bfont", "bsize"): if key in t: del t[key] diff --git a/qt/aqt/forms/browserdisp.ui b/qt/aqt/forms/browserdisp.ui index b9c0394ff..2813c9ee5 100644 --- a/qt/aqt/forms/browserdisp.ui +++ b/qt/aqt/forms/browserdisp.ui @@ -53,13 +53,6 @@ - - - - 6 - - - @@ -91,7 +84,6 @@ qfmt afmt font - fontSize buttonBox