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

Merge branch 'master' into gtk3-merge-master-b8eb349

Browse Source
This commit is contained in:
Morgan Hardwood
2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtgui/imagearea.h
View File

@@ -33,7 +33,7 @@
#include "edit.h"
class ImageAreaPanel;
class ImageArea : public Gtk::DrawingArea, public CropWindowListener, public EditDataProvider
class ImageArea : public Gtk::DrawingArea, public CropWindowListener, public EditDataProvider, public LockablePickerToolListener
{
friend class ZoomPanel;
@@ -70,10 +70,11 @@ public:
PreviewModePanel* previewModePanel;
ImageArea* iLinkedImageArea; // used to set a reference to the Before image area, which is set when before/after view is enabled
ImageArea (ImageAreaPanel* p);
explicit ImageArea (ImageAreaPanel* p);
~ImageArea ();
void setImProcCoordinator (rtengine::StagedImageProcessor* ipc_);
rtengine::StagedImageProcessor* getImProcCoordinator() const;
void setImProcCoordinator(rtengine::StagedImageProcessor* ipc_);
void setPreviewModePanel(PreviewModePanel* previewModePanel_)
{
previewModePanel = previewModePanel_;
@@ -122,6 +123,7 @@ public:
void cropWindowSelected (CropWindow* cw);
void cropWindowClosed (CropWindow* cw);
ToolMode getToolMode ();
bool showColorPickers ();
void setToolHand ();
void straightenReady (double rotDeg);
void spotWBSelected (int x, int y);
@@ -143,6 +145,9 @@ public:
void cropZoomChanged (CropWindow* cw);
void initialImageArrived (CropWindow* cw) ;
// LockablePickerToolListener interface
void switchPickerVisibility (bool isVisible);
CropWindow* getMainCropWindow ()
{
return mainCropWindow;