From 005af4ea9842652a3fbf671a99f59edfcecb9547 Mon Sep 17 00:00:00 2001
From: reionwong <reionwong@gmail.com>
Date: Sat, 14 Aug 2021 08:20:30 +0800
Subject: [PATCH] Fix shortcuts override

---
 src/qml/Terminal.qml | 5 +++++
 src/qml/main.qml     | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/qml/Terminal.qml b/src/qml/Terminal.qml
index d6e5d6a..2f5635e 100644
--- a/src/qml/Terminal.qml
+++ b/src/qml/Terminal.qml
@@ -55,12 +55,14 @@ Page {
                 && (event.modifiers & Qt.ControlModifier)
                 && (event.modifiers & Qt.ShiftModifier)) {
             _copyAction.trigger()
+            event.accepted = true
         }
 
         if ((event.key === Qt.Key_V)
                 && (event.modifiers & Qt.ControlModifier)
                 && (event.modifiers & Qt.ShiftModifier)) {
             _pasteAction.trigger()
+            event.accepted = true
         }
 
         if ((event.key === Qt.Key_Q)
@@ -73,16 +75,19 @@ Page {
                 && (event.modifiers & Qt.ControlModifier)
                 && (event.modifiers & Qt.ShiftModifier)) {
             root.openNewTab()
+            event.accepted = true
         }
 
         if ((event.key === Qt.Key_W)
                 && (event.modifiers & Qt.ControlModifier)
                 && (event.modifiers & Qt.ShiftModifier)) {
             root.closeCurrentTab()
+            event.accepted = true
         }
 
         if (event.key === Qt.Key_Tab && event.modifiers & Qt.ControlModifier) {
             root.toggleTab()
+            event.accepted = true
         }
     }
 
diff --git a/src/qml/main.qml b/src/qml/main.qml
index 3a96403..e4e7d99 100644
--- a/src/qml/main.qml
+++ b/src/qml/main.qml
@@ -72,7 +72,7 @@ FishUI.Window {
             anchors.leftMargin: FishUI.Units.smallSpacing
             anchors.rightMargin: FishUI.Units.smallSpacing
             anchors.topMargin: FishUI.Units.smallSpacing
-            anchors.bottomMargin: FishUI.Units.smallSpacing
+//            anchors.bottomMargin: FishUI.Units.smallSpacing
             spacing: FishUI.Units.smallSpacing
 
             ListView {
@@ -156,7 +156,7 @@ FishUI.Window {
             FishUI.RoundImageButton {
                 source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + "add.svg"
                 onClicked: root.openNewTab()
-                Layout.alignment: Qt.AlignTop
+                Layout.alignment: Qt.AlignVCenter
             }
         }
     }