From 08e740d45be076ce01702db0d921078ed1856740 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 3 Nov 2019 13:33:48 +0200 Subject: [PATCH] - fixed a small issue with clicking in a disabled FCDoubleSpinner or FCSpinner still doing a selection --- README.md | 1 + flatcamGUI/GUIElements.py | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index d0c20cf6..930fa9ed 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ CAD program, and create G-Code for Isolation routing. - fixed the V-shape tool diameter calculation in NCC Tool - in NCC Tool made the new tool dia (circular type) a parameter in Preferences +- fixed a small issue with clicking in a disabled FCDoubleSpinner or FCSpinner still doing a selection 30.10.2019 diff --git a/flatcamGUI/GUIElements.py b/flatcamGUI/GUIElements.py index dcf7238b..2fbbc58a 100644 --- a/flatcamGUI/GUIElements.py +++ b/flatcamGUI/GUIElements.py @@ -519,12 +519,13 @@ class FCSpinner(QtWidgets.QSpinBox): def eventFilter(self, object, event): if event.type() == QtCore.QEvent.MouseButtonPress: - if self.readyToEdit: - self.lineEdit().selectAll() - self.readyToEdit = False - else: - self.lineEdit().deselect() - return True + if self.isEnabled(): + if self.readyToEdit: + self.lineEdit().selectAll() + self.readyToEdit = False + else: + self.lineEdit().deselect() + return True return False def keyPressEvent(self, event): @@ -595,12 +596,13 @@ class FCDoubleSpinner(QtWidgets.QDoubleSpinBox): def eventFilter(self, object, event): if event.type() == QtCore.QEvent.MouseButtonPress: - if self.readyToEdit: - self.lineEdit().selectAll() - self.readyToEdit = False - else: - self.lineEdit().deselect() - return True + if self.isEnabled(): + if self.readyToEdit: + self.lineEdit().selectAll() + self.readyToEdit = False + else: + self.lineEdit().deselect() + return True return False def keyPressEvent(self, event):