Commit 74b008a5 authored by dmMaze's avatar dmMaze
Browse files

fix pen scaling with shortcuts

parent 319d7708

ui/canvas.py

+0 −8
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ from .stylewidgets import FadeLabel 
from .image_edit import ImageEditMode, DrawingLayer, StrokeImgItem

from .page_search_widget import PageSearchWidget

from utils import shared as C

from utils.config import pcfg



CANVAS_SCALE_MAX = 3.0

CANVAS_SCALE_MIN = 0.1
@@ -452,8 +451,6 @@ class Canvas(QGraphicsScene): 
        key = event.key()

        if self.editing_textblkitem is not None:

            return super().keyPressEvent(event)

        elif key == QKEY.Key_Alt:

            self.alt_pressed = True

        elif key in ARROWKEY2DIRECTION:

            sel_blkitems = self.selected_text_items()

            if len(sel_blkitems) > 0:
@@ -475,11 +472,6 @@ class Canvas(QGraphicsScene): 
            self.textlayer_trans_slider.setValue(value)

            self.originallayer_trans_slider.setValue(100 - value)



    def keyReleaseEvent(self, event: QKeyEvent) -> None:

        if event.key() == QKEY.Key_Alt:

            self.alt_pressed = False

        return super().keyReleaseEvent(event)



    def addStrokeImageItem(self, pos: QPointF, pen: QPen, erasing: bool = False):

        if self.stroke_img_item is not None:

            self.stroke_img_item.startNewPoint(pos)

ui/mainwindow.py

+19 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ from typing import List 


from qtpy.QtWidgets import QHBoxLayout, QVBoxLayout, QApplication, QStackedWidget, QSplitter, QListWidget, QShortcut, QListWidgetItem, QMessageBox, QTextEdit, QPlainTextEdit

from qtpy.QtCore import Qt, QPoint, QSize, QEvent, Signal

from qtpy.QtGui import QTextCursor, QGuiApplication, QIcon, QCloseEvent, QKeySequence, QImage, QPainter, QClipboard

from qtpy.QtGui import QTextCursor, QGuiApplication, QIcon, QCloseEvent, QKeySequence, QKeyEvent, QPainter, QClipboard



from utils.logger import logger as LOGGER

from utils.io_utils import json_dump_nested_obj
@@ -1120,3 +1120,20 @@ class MainWindow(FramelessWindow): 
        text_list = text_list[:n_paragraph]



        self.canvas.push_undo_command(PasteSrcItemsCommand(src_widget_list, text_list))





    def keyPressEvent(self, event: QKeyEvent) -> None:

        key = event.key()

        if hasattr(self, 'canvas'):

            if key == Qt.Key.Key_Alt:

                self.canvas.alt_pressed = True

        return super().keyPressEvent(event)

    

    def keyReleaseEvent(self, event: QKeyEvent) -> None:

        if hasattr(self, 'canvas'):

            if event.key() == Qt.Key.Key_Alt:

                self.canvas.alt_pressed = False

                if self.canvas.scale_tool_mode:

                    self.canvas.scale_tool_mode = False

                    self.canvas.end_scale_tool.emit()

        return super().keyReleaseEvent(event)
 
 No newline at end of file