Merge from default. Hope I did it right...

This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions

View File

@@ -49,6 +49,7 @@ ImageArea::ImageArea (ImageAreaPanel* p) : parent(p) {
dirty = false;
ipc = NULL;
iLinkedImageArea = NULL;
}
ImageArea::~ImageArea () {
@@ -88,7 +89,8 @@ void ImageArea::on_resized (Gtk::Allocation& req) {
else {
mainCropWindow->setSize (get_width(), get_height());
}
}
parent->syncBeforeAfterViews();
}
}
void ImageArea::setImProcCoordinator (rtengine::StagedImageProcessor* ipc_) {
@@ -381,19 +383,19 @@ void ImageArea::setScrollPosition (int x, int y) {
void ImageArea::cropPositionChanged (CropWindow* cw) {
updateScrollbars ();
syncBeforeAfterViews ();
}
void ImageArea::cropWindowSizeChanged (CropWindow* cw) {
updateScrollbars ();
syncBeforeAfterViews ();
}
void ImageArea::cropZoomChanged (CropWindow* cw) {
if (cw==mainCropWindow) {
parent->zoomChanged ();
updateScrollbars ();
syncBeforeAfterViews ();
zoomPanel->refreshZoomLabel ();
}
}
@@ -420,8 +422,8 @@ void ImageArea::initialImageArrived (CropWindow* cw) {
mainCropWindow->zoomFit ();
}
void ImageArea::updateScrollbars () {
parent->refreshScrollBars ();
void ImageArea::syncBeforeAfterViews () {
parent->syncBeforeAfterViews ();
}
void ImageArea::setCropGUIListener (CropGUIListener* l) {