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

Merge branch 'dev' into issue4580

Browse Source
This commit is contained in:
Hombre
2018-06-05 20:49:44 +02:00
parent ed081923d7 d03907bcf8
commit b00f86d988
38 changed files with 258 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rtgui/filepanel.cc
View File

@@ -81,6 +81,7 @@ FilePanel::FilePanel () : parent(nullptr), error(0)
tpc->addPParamsChangeListener (history);
history->setProfileChangeListener (tpc);
history->set_size_request(-1, 50);
Gtk::ScrolledWindow* sFilterPanel = Gtk::manage ( new Gtk::ScrolledWindow() );
filterPanel = Gtk::manage ( new FilterPanel () );
@@ -120,7 +121,7 @@ FilePanel::FilePanel () : parent(nullptr), error(0)
tpcPaned = Gtk::manage ( new Gtk::VPaned () );
tpcPaned->pack1 (*tpc->toolPanelNotebook, false, true);
tpcPaned->pack2 (*history, true, true);
tpcPaned->pack2 (*history, true, false);
rightNotebook->append_page (*sFilterPanel, *filtLab);
rightNotebook->append_page (*inspectorPanel, *inspectLab);

12
rtgui/resize.cc
View File

@@ -65,7 +65,7 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
pack_start (*combos, Gtk::PACK_SHRINK, 4);
scale = new Adjuster (M("TP_RESIZE_SCALE"), 0.01, 4, 0.01, 1.);
scale = new Adjuster (M("TP_RESIZE_SCALE"), 0.01, MAX_SCALE, 0.01, 1.);
scale->setAdjusterListener (this);
pack_start (*scale, Gtk::PACK_SHRINK, 4);
@@ -94,12 +94,12 @@ Resize::Resize () : FoldableToolPanel(this, "resize", M("TP_RESIZE_LABEL"), fals
w->set_digits (0);
w->set_increments (1, 100);
w->set_value (800);
w->set_range (32, 4 * maxw);
w->set_range (32, MAX_SCALE * maxw);
h->set_digits (0);
h->set_increments (1, 100);
h->set_value (600);
h->set_range (32, 4 * maxh);
h->set_range (32, MAX_SCALE * maxh);
wconn = w->signal_value_changed().connect ( sigc::mem_fun(*this, &Resize::entryWChanged), true);
hconn = h->signal_value_changed().connect ( sigc::mem_fun(*this, &Resize::entryHChanged), true);
@@ -216,7 +216,7 @@ void Resize::write (ProcParams* pp, ParamsEdited* pedited)
if (pedited) {
pedited->resize.enabled = !get_inconsistent();
pedited->resize.dataspec = dataSpec != 4;
pedited->resize.dataspec = dataSpec != MAX_SCALE;
pedited->resize.appliesTo = appliesTo->get_active_row_number() != 2;
pedited->resize.method = method->get_active_row_number() != 3;
@@ -370,8 +370,8 @@ void Resize::setDimensions ()
refh = self->maxh;
}
self->w->set_range(32, 4 * refw);
self->h->set_range(32, 4 * refh);
self->w->set_range(32, MAX_SCALE * refw);
self->h->set_range(32, MAX_SCALE * refh);
switch (self->spec->get_active_row_number()) {
case 0: {

2
rtgui/resize.h
View File

@@ -80,6 +80,8 @@ private:
bool wDirty, hDirty;
ToolParamBlock* packBox;
IdleRegister idle_register;
static constexpr int MAX_SCALE = 16; // 16 to match the main preview max scale of 1600%
};
#endif