From 9beed20dc0e21728c6d2f67e657fd62314af6684 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Fri, 7 Mar 2014 10:12:07 +0900 Subject: [PATCH] tweak heights and font sizes --- aqt/deckbrowser.py | 2 +- aqt/main.py | 2 +- aqt/reviewer.py | 2 +- aqt/webview.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aqt/deckbrowser.py b/aqt/deckbrowser.py index 74ad1b0a3..60cbf1d9e 100644 --- a/aqt/deckbrowser.py +++ b/aqt/deckbrowser.py @@ -345,7 +345,7 @@ where id > ?""", (self.mw.col.sched.dayCutoff-86400)*1000) if isMac: size = 28 else: - size = 36 + self.mw.fontHeightDelta*3 + size = 38 + self.mw.fontHeightDelta*3 self.bottom.web.setFixedHeight(size) self.bottom.web.setLinkHandler(self._linkHandler) diff --git a/aqt/main.py b/aqt/main.py index cdcc41a2f..0d90cf6af 100644 --- a/aqt/main.py +++ b/aqt/main.py @@ -1084,7 +1084,7 @@ will be lost. Continue?""")) def setupFonts(self): f = QFontInfo(self.font()) ws = QWebSettings.globalSettings() - self.fontHeight = f.pixelSize() + self.fontHeight = max(14, f.pixelSize()) self.fontFamily = f.family() self.fontHeightDelta = max(0, self.fontHeight - 13) ws.setFontFamily(QWebSettings.StandardFont, self.fontFamily) diff --git a/aqt/reviewer.py b/aqt/reviewer.py index 79216e00b..ffc239888 100644 --- a/aqt/reviewer.py +++ b/aqt/reviewer.py @@ -47,7 +47,7 @@ class Reviewer(object): if isMac: self.bottom.web.setFixedHeight(46) else: - self.bottom.web.setFixedHeight(52+self.mw.fontHeightDelta*4) + self.bottom.web.setFixedHeight(54+self.mw.fontHeightDelta*4) self.bottom.web.setLinkHandler(self._linkHandler) self._reps = None self.nextCard() diff --git a/aqt/webview.py b/aqt/webview.py index 3be755315..5afd0f72e 100644 --- a/aqt/webview.py +++ b/aqt/webview.py @@ -109,7 +109,7 @@ class AnkiWebView(QWebView): def stdHtml(self, body, css="", bodyClass="", loadCB=None, js=None, head=""): if isMac: - button = "font-weight: bold; height: 24px;" + button = "font-weight: normal; height: 24px;" else: button = "font-weight: normal;" self.setHtml("""