Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ensure text does not collide in splash screen

Browse Source
This commit is contained in:
Kovid Goyal 2017-06-16 18:48:12 +05:30
parent b22fdd6d08
commit a7c12909a1
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/splash_screen.py
View File

@ -15,7 +15,7 @@ from calibre.utils.monotonic import monotonic
class SplashScreen(QSplashScreen): class SplashScreen(QSplashScreen):
TITLE_SIZE = 20 # pt TITLE_SIZE = 18 # pt
BODY_SIZE = 12 # pt BODY_SIZE = 12 # pt
FOOTER_SIZE = 9 # pt FOOTER_SIZE = 9 # pt
LOGO_SIZE = 96 # px LOGO_SIZE = 96 # px
@ -84,14 +84,16 @@ class SplashScreen(QSplashScreen):
y += self.title_height + 5 y += self.title_height + 5
painter.setPen(QPen(self.dark_brush.color())) painter.setPen(QPen(self.dark_brush.color()))
painter.setFont(self.body_font) painter.setFont(self.body_font)
painter.drawText(x, y, width, self.line_height, Qt.AlignLeft | Qt.AlignVCenter | Qt.TextSingleLine, _( br = painter.drawText(x, y, width, self.line_height, Qt.AlignLeft | Qt.AlignVCenter | Qt.TextSingleLine, _(
'Starting up, please wait...')) 'Starting up, please wait...'))
starting_up_bottom = br.bottom()
# Draw footer # Draw footer
m = self.message() m = self.message()
if m and m.strip(): if m and m.strip():
painter.setFont(self.footer_font) painter.setFont(self.footer_font)
painter.drawText(x, bottom - self.line_height, width, self.line_height, Qt.AlignLeft | Qt.AlignTop | Qt.TextSingleLine, m) b = max(starting_up_bottom + 5, bottom - self.line_height)
painter.drawText(x, b, width, self.line_height, Qt.AlignLeft | Qt.AlignTop | Qt.TextSingleLine, m)
painter.restore() painter.restore()