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

Merge branch 'dev' of https://github.com/Beep6581/RawTherapee into dev

Browse Source
This commit is contained in:
heckflosse 2018-01-15 21:54:04 +01:00
commit f1eebf876c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/colortoning.cc
View File

@ -331,7 +331,7 @@ ColorToning::ColorToning () : FoldableToolPanel(this, "colortoning", M("TP_COLOR
labgridReset->get_style_context()->add_class(GTK_STYLE_CLASS_FLAT); labgridReset->get_style_context()->add_class(GTK_STYLE_CLASS_FLAT);
labgridReset->set_can_focus(false); labgridReset->set_can_focus(false);
labgridReset->set_size_request(-1, 20); labgridReset->set_size_request(-1, 20);
labgridReset->signal_button_release_event().connect([=](GdkEventButton* release_event) { labgrid->reset(release_event->state & GDK_CONTROL_MASK ? true : false); return false; }); labgridReset->signal_button_release_event().connect(sigc::mem_fun(*this, &ColorToning::resetPressed));
labgridBox->pack_start(*labgridReset, false, false); labgridBox->pack_start(*labgridReset, false, false);
pack_start(*labgridBox, Gtk::PACK_EXPAND_WIDGET, 4); pack_start(*labgridBox, Gtk::PACK_EXPAND_WIDGET, 4);
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@ -1165,3 +1165,9 @@ void ColorToning::setBatchMode (bool batchMode)
cl2CurveEditorG->setBatchMode (batchMode); cl2CurveEditorG->setBatchMode (batchMode);
} }
bool ColorToning::resetPressed(GdkEventButton* event)
{
labgrid->reset(event->state & GDK_CONTROL_MASK);
return false;
}

2
rtgui/colortoning.h
View File

@ -53,6 +53,8 @@ public:
void setListener(ToolPanelListener *tpl); void setListener(ToolPanelListener *tpl);
private: private:
bool resetPressed(GdkEventButton* event);
//Gtk::HSeparator* satLimiterSep; //Gtk::HSeparator* satLimiterSep;
Gtk::HSeparator* colorSep; Gtk::HSeparator* colorSep;
CurveEditorGroup* colorCurveEditorG; CurveEditorGroup* colorCurveEditorG;