Fix shortcuts override

pull/2/head
reionwong 4 years ago
parent 1b1fdd42c8
commit 005af4ea98

@ -55,12 +55,14 @@ Page {
&& (event.modifiers & Qt.ControlModifier) && (event.modifiers & Qt.ControlModifier)
&& (event.modifiers & Qt.ShiftModifier)) { && (event.modifiers & Qt.ShiftModifier)) {
_copyAction.trigger() _copyAction.trigger()
event.accepted = true
} }
if ((event.key === Qt.Key_V) if ((event.key === Qt.Key_V)
&& (event.modifiers & Qt.ControlModifier) && (event.modifiers & Qt.ControlModifier)
&& (event.modifiers & Qt.ShiftModifier)) { && (event.modifiers & Qt.ShiftModifier)) {
_pasteAction.trigger() _pasteAction.trigger()
event.accepted = true
} }
if ((event.key === Qt.Key_Q) if ((event.key === Qt.Key_Q)
@ -73,16 +75,19 @@ Page {
&& (event.modifiers & Qt.ControlModifier) && (event.modifiers & Qt.ControlModifier)
&& (event.modifiers & Qt.ShiftModifier)) { && (event.modifiers & Qt.ShiftModifier)) {
root.openNewTab() root.openNewTab()
event.accepted = true
} }
if ((event.key === Qt.Key_W) if ((event.key === Qt.Key_W)
&& (event.modifiers & Qt.ControlModifier) && (event.modifiers & Qt.ControlModifier)
&& (event.modifiers & Qt.ShiftModifier)) { && (event.modifiers & Qt.ShiftModifier)) {
root.closeCurrentTab() root.closeCurrentTab()
event.accepted = true
} }
if (event.key === Qt.Key_Tab && event.modifiers & Qt.ControlModifier) { if (event.key === Qt.Key_Tab && event.modifiers & Qt.ControlModifier) {
root.toggleTab() root.toggleTab()
event.accepted = true
} }
} }

@ -72,7 +72,7 @@ FishUI.Window {
anchors.leftMargin: FishUI.Units.smallSpacing anchors.leftMargin: FishUI.Units.smallSpacing
anchors.rightMargin: FishUI.Units.smallSpacing anchors.rightMargin: FishUI.Units.smallSpacing
anchors.topMargin: FishUI.Units.smallSpacing anchors.topMargin: FishUI.Units.smallSpacing
anchors.bottomMargin: FishUI.Units.smallSpacing // anchors.bottomMargin: FishUI.Units.smallSpacing
spacing: FishUI.Units.smallSpacing spacing: FishUI.Units.smallSpacing
ListView { ListView {
@ -156,7 +156,7 @@ FishUI.Window {
FishUI.RoundImageButton { FishUI.RoundImageButton {
source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + "add.svg" source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + "add.svg"
onClicked: root.openNewTab() onClicked: root.openNewTab()
Layout.alignment: Qt.AlignTop Layout.alignment: Qt.AlignVCenter
} }
} }
} }

Loading…
Cancel
Save