Merge branch 'v0.6' into qt5-wip #2237
|
@ -17,7 +17,7 @@ class MessageCompose(QtWidgets.QTextEdit):
|
|||
if (
|
||||
(QtWidgets.QApplication.queryKeyboardModifiers()
|
||||
& QtCore.Qt.ControlModifier) == QtCore.Qt.ControlModifier
|
||||
and event.orientation() == QtCore.Qt.Vertical
|
||||
and event.angleDelta().y() != 0
|
||||
):
|
||||
if event.delta() > 0:
|
||||
self.zoomIn(1)
|
||||
|
|
|
@ -56,7 +56,7 @@ class MessageView(QtWidgets.QTextBrowser):
|
|||
if (
|
||||
(QtWidgets.QApplication.queryKeyboardModifiers()
|
||||
& QtCore.Qt.ControlModifier) == QtCore.Qt.ControlModifier
|
||||
and event.orientation() == QtCore.Qt.Vertical
|
||||
and event.angleDelta().y() != 0
|
||||
):
|
||||
zoom = self.currentFont().pointSize() * 100 / self.defaultFontPointSize
|
||||
QtWidgets.QApplication.activeWindow().statusbar.showMessage(
|
||||
|
|
Reference in New Issue
Block a user