merge with dev

2018-01-15 11:22:49 +01:00
parent 90bd7fa98d 3c50e8ff5b
commit 08a026a47e
6 changed files with 224 additions and 331 deletions
--- a/rtgui/coordinateadjuster.cc
+++ b/rtgui/coordinateadjuster.cc
@@ -135,7 +135,11 @@ void CoordinateAdjuster::createWidgets(const std::vector<Axis> &axis)
        box->attach_next_to(*(currAdjuster->spinButton), Gtk::POS_LEFT, 1, 1);
        box->attach_next_to(*(currAdjuster->label), Gtk::POS_LEFT, 1, 1);

-        add(*box);
+        Gtk::FlowBoxChild *fbChild = Gtk::manage(new Gtk::FlowBoxChild());
+        fbChild->set_can_focus(false);
+        fbChild->add(*box);
+
+        add(*fbChild);
    }
 }