Commit 0bfbfad0 authored by dmMaze's avatar dmMaze
Browse files

fix canvas scrolling

parent 941f5d20

ballontranslator/ui/canvas.py

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class CustomGV(QGraphicsView): 
    def wheelEvent(self, event : QWheelEvent) -> None:

        # qgraphicsview always scroll content according to wheelevent

        # which is not desired when scaling img

        if self.ctrl_pressed:

        if event.modifiers() == Qt.KeyboardModifier.ControlModifier:

            if self.do_scale:

                if event.angleDelta().y() > 0:

                    self.scale_up_signal.emit()
@@ -124,6 +124,7 @@ class Canvas(QGraphicsScene): 
            self.gv.setRenderHint(QPainter.RenderHint.SmoothPixmapTransform)



        self.search_widget = PageSearchWidget(self.gv)

        self.search_widget.hide()

        

        self.ctrl_relesed = self.gv.ctrl_released

        self.vscroll_bar = self.gv.verticalScrollBar()

ballontranslator/ui/global_search_widget.py

+2 −2
Original line number Diff line number Diff line
@@ -335,9 +335,9 @@ class GlobalSearchWidget(Widget): 
        self.replace_editor.setPlaceholderText(self.tr('Replace'))



        self.search_tree = SearchResultTree(self)

        self.replace_btn = NoBorderPushBtn(self.tr('Replace all'))

        self.replace_btn = NoBorderPushBtn(self.tr('Replace All'))

        self.replace_btn.clicked.connect(self.on_replace)

        self.replace_rerender_btn = NoBorderPushBtn(self.tr('Replace all and re-render'))

        self.replace_rerender_btn = NoBorderPushBtn(self.tr('Replace All and Re-render all pages'))

        self.replace_rerender_btn.clicked.connect(self.on_replace_rerender)

        self.replace_thread = GlobalReplaceThead()

ballontranslator/ui/mainwindowbars.py

+2 −0
Original line number Diff line number Diff line
@@ -400,6 +400,7 @@ class TitleBar(Widget): 
        self.save_state = ''

        self.setFixedHeight(TITLEBAR_HEIGHT)

        self.setMouseTracking(True)



        self.editToolBtn = TitleBarToolBtn(self)

        self.editToolBtn.setText(self.tr('Edit'))
@@ -465,6 +466,7 @@ class TitleBar(Widget): 
        self.mainwindow.showMinimized()



    def mousePressEvent(self, event: QMouseEvent) -> None:



        if C.FLAG_QT6:

            g_pos = event.globalPosition().toPoint()

        else:

ballontranslator/ui/page_search_widget.py

+7 −0
Original line number Diff line number Diff line
@@ -561,6 +561,13 @@ class PageSearchWidget(Widget): 
                    cursor.setPosition(matched.end, QTextCursor.MoveMode.KeepAnchor)

                    break



        if cursor is not None:

            if cursor.selectionEnd() not in self.current_highlighter.matched_map:

                for k, matched in self.current_highlighter.matched_map.items():

                    cursor.setPosition(matched.start)

                    cursor.setPosition(matched.end, QTextCursor.MoveMode.KeepAnchor)

                    break



        self.current_cursor = cursor



    def updateCounterText(self):