Merge branch 'master' into powerpencilII

4 files changed, 6 insertions, 1 deletions

diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index 7b4f67da9..79e1cbc10 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -1289,8 +1289,9 @@ void sp_event_context_snap_delay_handler(ToolBase *ec,
     // The snap delay will repeat the last motion event, which will lead to
     // erroneous points in the calligraphy context. And because we don't snap
     // in this context, we might just as well disable the snap delay all together
+    bool const c4 = ec->space_panning; // Don't snap while panning with the spacebar
 
-    if (c1 || c2 || c3) {
+    if (c1 || c2 || c3 || c4) {
         // Make sure that we don't send any pending snap events to a context if we know in advance
         // that we're not going to snap any way (e.g. while scrolling with middle mouse button)
         // Any motion event might affect the state of the context, leading to unexpected behavior
diff --git a/src/ui/widget/notebook-page.cpp b/src/ui/widget/notebook-page.cpp
index 6d8ff1d75..6bb84014c 100644
--- a/src/ui/widget/notebook-page.cpp
+++ b/src/ui/widget/notebook-page.cpp
@@ -20,6 +20,7 @@ namespace Widget {
 NotebookPage::NotebookPage(int n_rows, int n_columns, bool expand, bool fill, guint padding)
     :_table(Gtk::manage(new Gtk::Grid()))
 {
+    set_name("NotebookPage");
     set_border_width(2);
 
     _table->set_row_spacing(2);
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp
index 5f5b801d1..fa3f6e905 100644
--- a/src/ui/widget/object-composite-settings.cpp
+++ b/src/ui/widget/object-composite-settings.cpp
@@ -41,6 +41,7 @@ ObjectCompositeSettings::ObjectCompositeSettings(unsigned int verb_code, char co
   _fe_vbox(false, 0),
   _blocked(false)
 {
+    set_name( "CompositeSettings");
 
     // Filter Effects
     pack_start(_fe_vbox, false, false, 2);
diff --git a/src/ui/widget/spin-scale.cpp b/src/ui/widget/spin-scale.cpp
index f74626d9b..c658b4756 100644
--- a/src/ui/widget/spin-scale.cpp
+++ b/src/ui/widget/spin-scale.cpp
@@ -21,6 +21,7 @@ SpinScale::SpinScale(const char* label, double value, double lower, double upper
                      double /*climb_rate*/, int digits, const SPAttributeEnum a, const char* tip_text)
     : AttrWidget(a, value)
 {
+    set_name("SpinScale");
     _adjustment = Gtk::Adjustment::create(value, lower, upper, step_inc);
     _spinscale = gimp_spin_scale_new (_adjustment->gobj(), label, digits);
 
@@ -122,6 +123,7 @@ DualSpinScale::DualSpinScale(const char* label1, const char* label2, double valu
       //TRANSLATORS: "Link" means to _link_ two sliders together
       _link(C_("Sliders", "Link"))
 {
+    set_name("DualSpinScale");
     signal_value_changed().connect(signal_attr_changed().make_slot());
 
     _s1.get_adjustment()->signal_value_changed().connect(_signal_value_changed.make_slot());