liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'flowing-curve-edit-axis' into gtk3

Browse Source
This commit is contained in:
Hombre
2016-03-14 00:05:50 +01:00
parent cf7a175d74 e4259ae4b4
commit 137ea4cdfa
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtgui/coordinateadjuster.cc
View File

@@ -122,8 +122,6 @@ void CoordinateAdjuster::createWidgets(const std::vector<Axis> &axis)
axisAdjusters.resize(axis.size());
set_spacing(3);
AxisAdjuster *currAdjuster = NULL;
for (unsigned int i = 0; i < count; ++i) {
@@ -133,8 +131,17 @@ void CoordinateAdjuster::createWidgets(const std::vector<Axis> &axis)
currAdjuster->rangeLowerBound = currAxis->rangeLowerBound;
currAdjuster->rangeUpperBound = currAxis->rangeUpperBound;
pack_start(*(currAdjuster->label), Gtk::PACK_SHRINK, 0);
pack_start(*(currAdjuster->spinButton), Gtk::PACK_SHRINK, 0);
Gtk::Grid *box = Gtk::manage (new Gtk::Grid());
box->set_orientation(Gtk::ORIENTATION_HORIZONTAL);
box->set_column_spacing(3);
setExpandAlignProperties(currAdjuster->label, false, false, Gtk::ALIGN_START, Gtk::ALIGN_CENTER);
setExpandAlignProperties(currAdjuster->spinButton, true, false, Gtk::ALIGN_FILL, Gtk::ALIGN_CENTER);
box->attach_next_to(*(currAdjuster->spinButton), Gtk::POS_LEFT, 1, 1);
box->attach_next_to(*(currAdjuster->label), Gtk::POS_LEFT, 1, 1);
add(*box);
}
}

2
rtgui/coordinateadjuster.h
View File

@@ -70,7 +70,7 @@ public:
*
* The position of the Axis in the vector will be used in the communication between the Adjuster and the Provider to identify the Axis
*/
class CoordinateAdjuster : public Gtk::HBox
class CoordinateAdjuster : public Gtk::FlowBox
{
public: