From 30d896cf8b60ac7b9f0a46ad00703be879dcfbb0 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Tue, 31 Aug 2021 19:05:30 +0200
Subject: [PATCH] WIP: disable Escape, Enter keys. No focus for sliders to keep
 focus inside drawing if possible.

---
 .../tools/view_25d/lay_plugin/D25View.ui      | 39 ++++++++++++++-----
 .../tools/view_25d/lay_plugin/layD25View.cc   |  6 +++
 .../tools/view_25d/lay_plugin/layD25View.h    |  1 +
 3 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/plugins/tools/view_25d/lay_plugin/D25View.ui b/src/plugins/tools/view_25d/lay_plugin/D25View.ui
index d8b0c85e8..f80c461a6 100644
--- a/src/plugins/tools/view_25d/lay_plugin/D25View.ui
+++ b/src/plugins/tools/view_25d/lay_plugin/D25View.ui
@@ -73,6 +73,9 @@
           <height>16777215</height>
          </size>
         </property>
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
         <property name="minimum">
          <number>-300</number>
         </property>
@@ -150,6 +153,9 @@
       </item>
       <item>
        <widget class="QSlider" name="vzoom_slider">
+        <property name="focusPolicy">
+         <enum>Qt::NoFocus</enum>
+        </property>
         <property name="minimum">
          <number>-300</number>
         </property>
@@ -444,12 +450,25 @@
        </widget>
       </item>
       <item>
-       <widget class="QDialogButtonBox" name="buttonBox">
+       <spacer name="horizontalSpacer_3">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="standardButtons">
-         <set>QDialogButtonBox::Close</set>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="pushButton">
+        <property name="text">
+         <string>Close</string>
+        </property>
+        <property name="autoDefault">
+         <bool>false</bool>
         </property>
        </widget>
       </item>
@@ -470,18 +489,18 @@
  </resources>
  <connections>
   <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
+   <sender>pushButton</sender>
+   <signal>clicked()</signal>
    <receiver>D25View</receiver>
-   <slot>accept()</slot>
+   <slot>hide()</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>530</x>
-     <y>626</y>
+     <x>808</x>
+     <y>634</y>
     </hint>
     <hint type="destinationlabel">
-     <x>443</x>
-     <y>643</y>
+     <x>767</x>
+     <y>659</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/plugins/tools/view_25d/lay_plugin/layD25View.cc b/src/plugins/tools/view_25d/lay_plugin/layD25View.cc
index ea2a88b8d..aa5ee091b 100644
--- a/src/plugins/tools/view_25d/lay_plugin/layD25View.cc
+++ b/src/plugins/tools/view_25d/lay_plugin/layD25View.cc
@@ -221,5 +221,11 @@ D25View::accept ()
   QDialog::accept ();
 }
 
+void
+D25View::reject ()
+{
+  QDialog::reject ();
+}
+
 }
 
diff --git a/src/plugins/tools/view_25d/lay_plugin/layD25View.h b/src/plugins/tools/view_25d/lay_plugin/layD25View.h
index ec06ce1b2..ff38bbf43 100644
--- a/src/plugins/tools/view_25d/lay_plugin/layD25View.h
+++ b/src/plugins/tools/view_25d/lay_plugin/layD25View.h
@@ -53,6 +53,7 @@ public:
 
 protected:
   void accept ();
+  void reject ();
 
 private slots:
   void fit_button_clicked ();