add letter & line spacing controller (96f44868) · Commits · git-mirror / BallonsTranslator

ballontranslator/ui/fontformatpanel.py

+25 −4

Original line number	Diff line number	Diff line
		@@ -392,8 +392,12 @@ class SizeControlLabel(QLabel):

		def mouseMoveEvent(self, e: QMouseEvent) -> None:
		if self.mouse_pressed:
		new_pos = e.globalPos().x() if self.direction == 0 else e.globalPos().y()
		if self.direction == 0:
		new_pos = e.globalPos().x()
		self.size_ctrl_changed.emit(new_pos - self.cur_pos)
		else:
		new_pos = e.globalPos().y()
		self.size_ctrl_changed.emit(self.cur_pos - new_pos)
		self.cur_pos = new_pos
		return super().mouseMoveEvent(e)

		@@ -427,8 +431,10 @@ class FontFormatPanel(Widget):
		self.fontsizebox.apply_fontsize.connect(self.onApplyFontsize)
		self.fontsizebox.fcombobox.editTextChanged.connect(self.onSizeEditorChanged)

		self.lineSpacingLabel = QLabel(self)
		self.lineSpacingLabel = SizeControlLabel(self, direction=1)
		self.lineSpacingLabel.setObjectName("lineSpacingLabel")
		self.lineSpacingLabel.size_ctrl_changed.connect(self.onLineSpacingCtrlChanged)
		self.lineSpacingLabel.btn_released.connect(self.onLineSpacingCtrlReleased)

		self.lineSpacingBox = SizeComboBox([0, 10], self)
		self.lineSpacingBox.addItems(["1.0", "1.1", "1.2"])
		@@ -480,8 +486,11 @@ class FontFormatPanel(Widget):
		stroke_hlayout.addWidget(self.strokeColorPicker)
		stroke_hlayout.setSpacing(WIDGET_SPACING_CLOSE)

		self.letterSpacingLabel = QLabel(self)
		self.letterSpacingLabel = SizeControlLabel(self, direction=0)
		self.letterSpacingLabel.setObjectName("letterSpacingLabel")
		self.letterSpacingLabel.size_ctrl_changed.connect(self.onLetterSpacingCtrlChanged)
		self.letterSpacingLabel.btn_released.connect(self.onLetterSpacingCtrlReleased)

		self.letterSpacingBox = SizeComboBox([0, 10], self)
		self.letterSpacingBox.addItems(["0.0"])
		self.letterSpacingBox.setToolTip(self.tr("Change letter spacing"))
		@@ -621,6 +630,18 @@ class FontFormatPanel(Widget):
		def onStrokeCtrlReleased(self):
		self.update_stroke_width(self.strokeWidthBox.value())

		def onLetterSpacingCtrlChanged(self, delta: int):
		self.letterSpacingBox.setValue(self.letterSpacingBox.value() + delta * 0.01)

		def onLetterSpacingCtrlReleased(self):
		self.update_letter_spacing(self.letterSpacingBox.value())

		def onLineSpacingCtrlChanged(self, delta: int):
		self.lineSpacingBox.setValue(self.lineSpacingBox.value() + delta * 0.01)

		def onLineSpacingCtrlReleased(self):
		self.update_line_spacing(self.lineSpacingBox.value())

		def update_stroke_width(self, value: float):
		self.active_format.stroke_width = value
		self.restoreTextBlkItem()

ballontranslator/ui/scene_textlayout.py

+5 −5

Original line number	Diff line number	Diff line
		@@ -72,11 +72,11 @@ class CharFontFormat:

		@cached_property
		def br(self) -> QRectF:
		return get_punc_rect('啊', self.family, self.size, self.weight, self.font.italic())[1]
		return get_punc_rect('大', self.family, self.size, self.weight, self.font.italic())[1]

		@cached_property
		def tbr(self) -> QRectF:
		return get_punc_rect('啊', self.family, self.size, self.weight, self.font.italic())[0]
		return get_punc_rect('大', self.family, self.size, self.weight, self.font.italic())[0]

		@cached_property
		def space_width(self) -> int:
		@@ -144,9 +144,9 @@ class SceneTextLayout(QAbstractTextDocumentLayout):
		return rect

		def updateDocumentMargin(self, margin):
		doc_margin = self.document().documentMargin()
		self.max_height = doc_margin * 2 + self.available_height
		self.max_width = doc_margin * 2 + self.available_width
		doc_margin = self.document().documentMargin() * 2
		self.max_height = doc_margin + self.available_height
		self.max_width = doc_margin + self.available_width
		self.document().setDocumentMargin(margin)
		margin *= 2
		self.available_height = max(self.max_height - margin, 0)

ballontranslator/ui/textitem.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -301,7 +301,7 @@ class TextBlkItem(QGraphicsTextItem):
		return

		self.stroke_width = stroke_width
		sw = self.layout.max_font_size()
		sw = pt2px(self.layout.max_font_size()) * stroke_width
		self.layout.updateDocumentMargin(sw/2)
		self.layout.reLayout()
		self.on_document_enlarged()