Commit cafd7346 authored by dmMaze's avatar dmMaze
Browse files

fix displayed font size #576

parent 2cbad85a

ui/fontformat_commands.py

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ except: 
    from qtpy.QtGui import QUndoCommand



from . import shared_widget as SW

from utils.fontformat import FontFormat

from utils.fontformat import FontFormat, px2pt

from .textitem import TextBlkItem



global_default_set_kwargs = dict(set_selected=False, restore_cursor=False)
@@ -140,7 +140,7 @@ def ffmt_change_font_size(param_name: str, values: float, act_ffmt: FontFormat, 
    for blkitem, value in zip(blkitems, values):

        if value < 0:

            continue

        blkitem.setFontSize(value, clip_size=clip_size, **set_kwargs)

        blkitem.setFontSize(px2pt(value), clip_size=clip_size, **set_kwargs)



@font_formating(push_undostack=True)

def ffmt_change_alignment(param_name: str, values: float, act_ffmt: FontFormat, is_global: bool, blkitems: List[TextBlkItem], **kwargs):

ui/mainwindow.py

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ from utils import create_error_dialog 
from modules.translators.trans_chatgpt import GPTTranslator

from .misc import parse_stylesheet, set_html_family, QKEY

from utils.config import ProgramConfig, pcfg, save_config, text_styles, save_text_styles, load_textstyle_from, FontFormat

from utils.fontformat import pt2px

from .config_proj import ProjImgTrans

from .canvas import Canvas

from .configpanel import ConfigPanel

ui/scenetext_manager.py

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ except: 
from .textitem import TextBlkItem, TextBlock

from .canvas import Canvas

from .textedit_area import TransTextEdit, SourceTextEdit, TransPairWidget, SelectTextMiniMenu, TextEditListScrollArea, QVBoxLayout, Widget

from utils.fontformat import FontFormat, pt2px

from utils.fontformat import FontFormat

from .textedit_commands import propagate_user_edit, TextEditCommand, ReshapeItemCommand, MoveBlkItemsCommand, AutoLayoutCommand, ApplyFontformatCommand, ApplyEffectCommand, RotateItemCommand, TextItemEditCommand, TextEditCommand, PageReplaceOneCommand, PageReplaceAllCommand, MultiPasteCommand, ResetAngleCommand, SqueezeCommand

from .text_panel import FontFormatPanel

from utils.config import pcfg

ui/text_panel.py

+3 −3
Original line number Diff line number Diff line
@@ -561,9 +561,9 @@ class FontFormatPanel(Widget): 
    def set_active_format(self, font_format: FontFormat):

        C.active_format = font_format

        self.familybox.blockSignals(True)

        font_size = px2pt(font_format.font_size)

        if round(font_size) == font_size:

            font_size = str(font_size)

        font_size = round(font_format.font_size, 1)

        if int(font_size) == font_size:

            font_size = str(int(font_size))

        else:

            font_size = f'{font_size:.1f}'

        self.fontsizebox.fcombobox.setCurrentText(font_size)