Skip to content

Commit

Permalink
Merge pull request #68 from tokejepsen/master
Browse files Browse the repository at this point in the history
OSX specific font sizes
  • Loading branch information
tokejepsen authored Oct 12, 2016
2 parents 8401f38 + 91fde88 commit 6bcda8a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
14 changes: 9 additions & 5 deletions pyblish_lite/delegate.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import platform

from .vendor.Qt import QtWidgets, QtGui, QtCore

from . import model
Expand All @@ -23,12 +25,14 @@
"CRITICAL": QtGui.QColor("#ff4f75"),
}

scale_factors = {"darwin": 1.5}
scale_factor = scale_factors.get(platform.system().lower(), 1.0)
fonts = {
"h3": QtGui.QFont("Open Sans", 10, 900),
"h4": QtGui.QFont("Open Sans", 8, 400),
"h5": QtGui.QFont("Open Sans", 8, 800),
"smallAwesome": QtGui.QFont("FontAwesome", 8),
"largeAwesome": QtGui.QFont("FontAwesome", 16),
"h3": QtGui.QFont("Open Sans", 10 * scale_factor, 900),
"h4": QtGui.QFont("Open Sans", 8 * scale_factor, 400),
"h5": QtGui.QFont("Open Sans", 8 * scale_factor, 800),
"smallAwesome": QtGui.QFont("FontAwesome", 8 * scale_factor),
"largeAwesome": QtGui.QFont("FontAwesome", 16 * scale_factor),
}

icons = {
Expand Down
4 changes: 2 additions & 2 deletions pyblish_lite/version.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

VERSION_MAJOR = 0
VERSION_MINOR = 4
VERSION_PATCH = 1
VERSION_MINOR = 5
VERSION_PATCH = 0

version_info = (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
version = '%i.%i.%i' % version_info
Expand Down

0 comments on commit 6bcda8a

Please sign in to comment.