From 0ab53c39d16a02c0f05cc155752685b34185ae4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Batty=C3=A1nyi?= <86350313+LoKolbasz@users.noreply.github.com> Date: Tue, 18 Jul 2023 18:36:54 +0200 Subject: [PATCH] Resolved bug affecting the negative spot pickers --- rtgui/filmnegative.cc | 2 -- rtgui/guiutils.h | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rtgui/filmnegative.cc b/rtgui/filmnegative.cc index b37216479..c61134df9 100644 --- a/rtgui/filmnegative.cc +++ b/rtgui/filmnegative.cc @@ -262,8 +262,6 @@ FilmNegative::FilmNegative() : pack_start(*refPicker, Gtk::PACK_SHRINK, 0); - //BUG: After selecting a spot for the first time after the button is toggled, picking is still possible, while the button is NOT toggled. After picking for the second time picking is only possible after retoggleing the button - picker->_spotButton->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::editToggled)); refPicker->_spotButton->signal_toggled().connect(sigc::mem_fun(*this, &FilmNegative::refSpotToggled)); diff --git a/rtgui/guiutils.h b/rtgui/guiutils.h index 6306c5b4b..b6ccddc75 100644 --- a/rtgui/guiutils.h +++ b/rtgui/guiutils.h @@ -702,9 +702,9 @@ class SpotPicker : public Gtk::Grid SpotPicker(int const defaultValue, Glib::ustring const &buttonKey, Glib::ustring const &buttonTooltip, Glib::ustring const &labelKey); ~SpotPicker(); - inline Gtk::TreeModel::iterator get_active() + inline bool get_active() { - return _spotSizeSetter->get_active(); + return _spotButton->get_active(); } void set_active(bool b) {