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

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Morgan Hardwood
2015-09-16 21:04:25 +02:00
parent 7d9f743ce5 3935c6b2aa
commit eefc81b94b
21 changed files with 123 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/flatfield.cc
View File

@@ -44,8 +44,8 @@ FlatField::FlatField () : FoldableToolPanel(this, "flatfield", M("TP_FLATFIELD_L
flatFieldBlurRadius = Gtk::manage(new Adjuster (M("TP_FLATFIELD_BLURRADIUS"), 0, 200, 2, 32));
flatFieldBlurRadius->setAdjusterListener (this);
if (flatFieldBlurRadius->delay < 1000) {
flatFieldBlurRadius->delay = 1000;
if (flatFieldBlurRadius->delay < options.adjusterMaxDelay) {
flatFieldBlurRadius->delay = options.adjusterMaxDelay;
}
flatFieldBlurRadius->show();
@@ -65,8 +65,8 @@ FlatField::FlatField () : FoldableToolPanel(this, "flatfield", M("TP_FLATFIELD_L
flatFieldClipControl->setAdjusterListener(this);
flatFieldClipControl->addAutoButton("");
if (flatFieldClipControl->delay < 1000) {
flatFieldClipControl->delay = 1000;
if (flatFieldClipControl->delay < options.adjusterMaxDelay) {
flatFieldClipControl->delay = options.adjusterMaxDelay;
}
flatFieldClipControl->show();