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

39
rtgui/cropwindow.h
View File

@@ -61,6 +61,10 @@ class CropWindow : public LWButtonListener, public CropDisplayHandler, public Ed
bool isLowUpdatePriority;
CursorShape cursor_type;
// color pickers
std::vector<LockableColorPicker*> colorPickers;
LockableColorPicker* hoveredPicker;
// decoration
LWButton *bZoomIn, *bZoomOut, *bZoom100, /**bZoomFit,*/ *bClose;
LWButtonSet buttonSet;
@@ -92,7 +96,6 @@ class CropWindow : public LWButtonListener, public CropDisplayHandler, public Ed
std::list<CropWindowListener*> listeners;
CropWindow* observedCropWin; // Pointer to the currently active detail CropWindow
rtengine::StagedImageProcessor* ipc;
bool onArea (CursorArea a, int x, int y);
void updateCursor (int x, int y);
@@ -102,13 +105,19 @@ class CropWindow : public LWButtonListener, public CropDisplayHandler, public Ed
void drawUnscaledSpotRectangle (Cairo::RefPtr<Cairo::Context> cr, int rectSize);
void drawObservedFrame (Cairo::RefPtr<Cairo::Context> cr, int rw = 0, int rh = 0);
void changeZoom (int zoom, bool notify = true, int centerx = -1, int centery = -1);
void updateHoveredPicker (rtengine::Coord *imgPos = nullptr);
void cycleRGB ();
void cycleHSV ();
LockableColorPicker::Validity checkValidity (LockableColorPicker* picker, const rtengine::Coord &pos);
// Used by the mainCropWindow only
void getObservedFrameArea (int& x, int& y, int& w, int& h, int rw = 0, int rh = 0);
public:
CropHandler cropHandler;
CropWindow (ImageArea* parent, rtengine::StagedImageProcessor* ipc_, bool isLowUpdatePriority_, bool isDetailWindow);
CropWindow (ImageArea* parent, bool isLowUpdatePriority_, bool isDetailWindow);
~CropWindow ();
void setDecorated (bool decorated)
{
@@ -122,6 +131,7 @@ public:
{
observedCropWin = cw;
}
void deleteColorPickers ();
void screenCoordToCropBuffer (int phyx, int phyy, int& cropx, int& cropy);
void screenCoordToImage (int phyx, int phyy, int& imgx, int& imgy);
@@ -129,6 +139,7 @@ public:
void imageCoordToCropCanvas (int imgx, int imgy, int& phyx, int& phyy);
void imageCoordToScreen (int imgx, int imgy, int& phyx, int& phyy);
void imageCoordToCropBuffer (int imgx, int imgy, int& phyx, int& phyy);
void imageCoordToCropImage (int imgx, int imgy, int& phyx, int& phyy);
int scaleValueToImage (int value);
float scaleValueToImage (float value);
double scaleValueToImage (double value);
@@ -159,6 +170,7 @@ public:
bool isInside (int x, int y);
void scroll (int state, GdkScrollDirection direction, int x, int y);
void buttonPress (int button, int num, int state, int x, int y);
void buttonRelease (int button, int num, int state, int x, int y);
void pointerMoved (int bstate, int x, int y);
@@ -181,24 +193,13 @@ public:
void setCropAnchorPosition (int& w, int& h);
// listeners
void setCropGUIListener (CropGUIListener* cgl)
{
cropgl = cgl;
}
void setPointerMotionListener (PointerMotionListener* pml)
{
pmlistener = pml;
}
void setPointerMotionHListener (PointerMotionListener* pml)
{
pmhlistener = pml;
}
void setCropGUIListener (CropGUIListener* cgl);
void setPointerMotionListener (PointerMotionListener* pml);
PointerMotionListener* getPointerMotionListener ();
void setPointerMotionHListener (PointerMotionListener* pml);
// crop window listeners
void addCropWindowListener (CropWindowListener* l)
{
listeners.push_back (l);
}
void addCropWindowListener (CropWindowListener* l);
void delCropWindowListener (CropWindowListener* l);
// crophandlerlistener interface
@@ -210,7 +211,7 @@ public:
void remoteMove (int deltaX, int deltaY);
void remoteMoveReady ();
EditDataProvider* getImageArea();
ImageArea* getImageArea();
};
#endif