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:
Beep6581
2016-06-09 23:36:02 +02:00
parent 3da7d84ba9 a824b71808
commit ca71a0b7d2
52 changed files with 6114 additions and 6013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rtgui/lensgeom.cc
View File

@@ -44,6 +44,11 @@ LensGeometry::LensGeometry () : FoldableToolPanel(this, "lensgeom", M("TP_LENSGE
show_all ();
}
LensGeometry::~LensGeometry ()
{
g_idle_remove_by_data(this);
}
void LensGeometry::read (const ProcParams* pp, const ParamsEdited* pedited)
{
@@ -114,3 +119,30 @@ void LensGeometry::setBatchMode (bool batchMode)
ToolPanel::setBatchMode (batchMode);
removeIfThere (this, autoCrop);
}
void LensGeometry::disableAutoFillIfActive ()
{
g_idle_add(doDisableAutoFillIfActive, this);
}
int LensGeometry::doDisableAutoFillIfActive (void* data)
{
GThreadLock lock; // Is this really needed?
LensGeometry* const instance = static_cast<LensGeometry*>(data);
if (!instance->batchMode) {
if (instance->fill->get_active()) {
instance->fillConn.block (true);
instance->fill->set_active(false);
if (instance->listener) {
instance->listener->panelChanged (EvTransAutoFill, M("GENERAL_DISABLED"));
}
instance->fillConn.block (false);
}
}
return 0;
}