Revert "tweak heights and font sizes"

This reverts commit 9beed20dc0.

beta testers all seem to prefer the original smaller size
This commit is contained in:
Damien Elmes 2014-03-27 14:02:55 +09:00
parent b562b8c6dc
commit 5044089d42
4 changed files with 4 additions and 4 deletions

View file

@ -345,7 +345,7 @@ where id > ?""", (self.mw.col.sched.dayCutoff-86400)*1000)
if isMac: if isMac:
size = 28 size = 28
else: else:
size = 38 + self.mw.fontHeightDelta*3 size = 36 + self.mw.fontHeightDelta*3
self.bottom.web.setFixedHeight(size) self.bottom.web.setFixedHeight(size)
self.bottom.web.setLinkHandler(self._linkHandler) self.bottom.web.setLinkHandler(self._linkHandler)

View file

@ -1086,7 +1086,7 @@ will be lost. Continue?"""))
def setupFonts(self): def setupFonts(self):
f = QFontInfo(self.font()) f = QFontInfo(self.font())
ws = QWebSettings.globalSettings() ws = QWebSettings.globalSettings()
self.fontHeight = max(14, f.pixelSize()) self.fontHeight = f.pixelSize()
self.fontFamily = f.family() self.fontFamily = f.family()
self.fontHeightDelta = max(0, self.fontHeight - 13) self.fontHeightDelta = max(0, self.fontHeight - 13)
ws.setFontFamily(QWebSettings.StandardFont, self.fontFamily) ws.setFontFamily(QWebSettings.StandardFont, self.fontFamily)

View file

@ -47,7 +47,7 @@ class Reviewer(object):
if isMac: if isMac:
self.bottom.web.setFixedHeight(46) self.bottom.web.setFixedHeight(46)
else: else:
self.bottom.web.setFixedHeight(54+self.mw.fontHeightDelta*4) self.bottom.web.setFixedHeight(52+self.mw.fontHeightDelta*4)
self.bottom.web.setLinkHandler(self._linkHandler) self.bottom.web.setLinkHandler(self._linkHandler)
self._reps = None self._reps = None
self.nextCard() self.nextCard()

View file

@ -109,7 +109,7 @@ class AnkiWebView(QWebView):
def stdHtml(self, body, css="", bodyClass="", loadCB=None, js=None, head=""): def stdHtml(self, body, css="", bodyClass="", loadCB=None, js=None, head=""):
if isMac: if isMac:
button = "font-weight: normal; height: 24px;" button = "font-weight: bold; height: 24px;"
else: else:
button = "font-weight: normal;" button = "font-weight: normal;"
self.setHtml(""" self.setHtml("""