Merge from default. Hope I did it right...
This commit is contained in:
@@ -66,11 +66,14 @@ class ImageArea : public Gtk::DrawingArea, public CropWindowListener {
|
||||
ZoomPanel* zoomPanel;
|
||||
IndicateClippedPanel* indClippedPanel;
|
||||
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);
|
||||
~ImageArea ();
|
||||
|
||||
void setImProcCoordinator (rtengine::StagedImageProcessor* ipc_);
|
||||
void setPreviewModePanel(PreviewModePanel* previewModePanel_){previewModePanel = previewModePanel_;};
|
||||
void setIndicateClippedPanel(IndicateClippedPanel* indClippedPanel_){indClippedPanel = indClippedPanel_;};
|
||||
|
||||
void getScrollImageSize (int& w, int& h);
|
||||
void getScrollPosition (int& x, int& y);
|
||||
@@ -89,7 +92,7 @@ class ImageArea : public Gtk::DrawingArea, public CropWindowListener {
|
||||
bool on_scroll_event (GdkEventScroll* event);
|
||||
void on_resized (Gtk::Allocation& req);
|
||||
void styleChanged (const Glib::RefPtr<Gtk::Style>& style);
|
||||
void updateScrollbars ();
|
||||
void syncBeforeAfterViews ();
|
||||
|
||||
void setCropGUIListener (CropGUIListener* l);
|
||||
void setPointerMotionListener (PointerMotionListener* pml);
|
||||
|
Reference in New Issue
Block a user