fix ui on macos #234 (fd9c56e4) · Commits · git-mirror / BallonsTranslator

launch.py

+6 −0

Original line number	Diff line number	Diff line
		@@ -204,6 +204,12 @@ def main():
		yahei = QFont('Microsoft YaHei UI')
		if yahei.exactMatch() and not sys.platform == 'darwin':
		QGuiApplication.setFont(yahei)
		C.DEFAULT_FONT_FAMILY = 'Microsoft YaHei UI'
		C.APP_DEFAULT_FONT = 'Microsoft YaHei UI'
		else:
		app_font = app.font().family()
		C.DEFAULT_FONT_FAMILY = app_font
		C.APP_DEFAULT_FONT = app_font

		C.APP_DEFAULT_FONT = app.font().defaultFamily()

ui/configpanel.py

+4 −1

Original line number	Diff line number	Diff line
		@@ -179,6 +179,9 @@ class ConfigContent(QScrollArea):
		else:
		self.active_label = block.header
		self.active_label.setActiveBackground()
		if C.USE_PYSIDE6:
		self.ensureWidgetVisible(self.active_label, ymargin=self.active_label.height() * 7)
		else:
		self.ensureWidgetVisible(self.active_label, yMargin=self.active_label.height() * 7)

		def deactiveLabel(self):

ui/constants.py

+5 −3

Original line number	Diff line number	Diff line
		import os.path as osp
		import os
		import sys

		ICON_PATH = 'icons/[ICONNAME]'

		@@ -16,8 +17,8 @@ CONFIG_PATH = osp.join(PROGRAM_PATH, 'config/config.json')
		DOWNLOAD_PATH = osp.join(PROGRAM_PATH, 'gallery-dl')

		CONFIG_FONTSIZE_HEADER = 18
		CONFIG_FONTSIZE_TABLE = 14
		CONFIG_FONTSIZE_CONTENT = 14
		CONFIG_FONTSIZE_TABLE = 16
		CONFIG_FONTSIZE_CONTENT = 16

		CONFIG_COMBOBOX_HEIGHT = 30
		CONFIG_COMBOBOX_SHORT = 200
		@@ -75,3 +76,4 @@ for p in os.listdir(TRANSLATE_DIR):
		DEFAULT_DISPLAY_LANG = 'English'

		USE_PYSIDE6 = False
		ON_MACOS = sys.platform == 'darwin'
		No newline at end of file

ui/mainwindow.py

+2 −1

Original line number	Diff line number	Diff line
		@@ -399,6 +399,7 @@ class MainWindow(FramelessWindow):
		def changeEvent(self, event: QEvent):
		if event.type() == QEvent.Type.WindowStateChange:
		if self.windowState() & Qt.WindowState.WindowMaximized:
		if not C.ON_MACOS:
		self.titleBar.maxBtn.setChecked(True)
		elif event.type() == QEvent.Type.ActivationChange:
		self.canvas.on_activation_changed()

ui/mainwindowbars.py

+20 −14

Original line number	Diff line number	Diff line
		@@ -395,21 +395,15 @@ class TitleBar(Widget):
		self.translate_page_trigger = translatePageAction.triggered

		self.iconLabel = QLabel(self)
		if not C.ON_MACOS:
		self.iconLabel.setFixedWidth(LEFTBAR_WIDTH - 12)
		else:
		self.iconLabel.setFixedWidth(LEFTBAR_WIDTH)

		self.titleLabel = QLabel('BallonTranslator')
		self.titleLabel.setObjectName('TitleLabel')
		self.titleLabel.setAlignment(Qt.AlignmentFlag.AlignCenter)
		self.minBtn = QPushButton()
		self.minBtn.setObjectName('minBtn')
		self.minBtn.clicked.connect(self.onMinBtnClicked)
		self.maxBtn = QCheckBox()
		self.maxBtn.setObjectName('maxBtn')
		self.maxBtn.clicked.connect(self.onMaxBtnClicked)
		self.closeBtn = QPushButton()
		self.closeBtn.setObjectName('closeBtn')
		self.closeBtn.clicked.connect(self.closebtn_clicked)
		self.maxBtn.setFixedSize(48, 27)

		hlayout = QHBoxLayout(self)
		hlayout.setAlignment(Qt.AlignmentFlag.AlignCenter)
		hlayout.addWidget(self.iconLabel)
		@@ -420,6 +414,18 @@ class TitleBar(Widget):
		hlayout.addStretch()
		hlayout.addWidget(self.titleLabel)
		hlayout.addStretch()

		if not C.ON_MACOS:
		self.minBtn = QPushButton()
		self.minBtn.setObjectName('minBtn')
		self.minBtn.clicked.connect(self.onMinBtnClicked)
		self.maxBtn = QCheckBox()
		self.maxBtn.setObjectName('maxBtn')
		self.maxBtn.clicked.connect(self.onMaxBtnClicked)
		self.maxBtn.setFixedSize(48, 27)
		self.closeBtn = QPushButton()
		self.closeBtn.setObjectName('closeBtn')
		self.closeBtn.clicked.connect(self.closebtn_clicked)
		hlayout.addWidget(self.minBtn)
		hlayout.addWidget(self.maxBtn)
		hlayout.addWidget(self.closeBtn)