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

merge with dev

Browse Source
This commit is contained in:
Desmis 2018-02-07 08:54:22 +01:00
commit 24f453ba2c
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtgui/crophandler.cc
View File

@ -198,9 +198,10 @@ void CropHandler::setZoom (int z, int centerx, int centery)
compDim ();
if (enabled && (oldZoom != zoom || oldcax != cax || oldcay != cay || oldCropX != cropX || oldCropY != cropY || oldCropW != cropW || oldCropH != cropH)) {
if (needsFullRefresh) {
if (needsFullRefresh && !ipc->getHighQualComputed()) {
cropPixbuf.clear ();
ipc->startProcessing(M_HIGHQUAL);
ipc->setHighQualComputed();
} else {
update ();
}

9
rtgui/cropwindow.cc
View File

@ -2005,7 +2005,7 @@ void CropWindow::zoomOut (bool toCursor, int cursorX, int cursorY)
fitZoom = false;
}
void CropWindow::zoom11 ()
void CropWindow::zoom11 (bool notify)
{
int x = -1;
@ -2027,7 +2027,7 @@ void CropWindow::zoom11 ()
screenCoordToImage(xpos + imgX + imgW / 2, ypos + imgY + imgH / 2, x, y);
}
changeZoom (zoom11index, true, x, y);
changeZoom (zoom11index, notify, x, y, notify);
fitZoom = false;
}
@ -2182,7 +2182,7 @@ void CropWindow::updateHoveredPicker (rtengine::Coord *imgPos)
}
}
}
void CropWindow::changeZoom (int zoom, bool notify, int centerx, int centery)
void CropWindow::changeZoom (int zoom, bool notify, int centerx, int centery, bool needsRedraw)
{
if (zoom < 0) {
@ -2201,7 +2201,8 @@ void CropWindow::changeZoom (int zoom, bool notify, int centerx, int centery)
listener->cropZoomChanged (this);
}
iarea->redraw ();
if (needsRedraw)
iarea->redraw ();
}
LockableColorPicker::Validity CropWindow::checkValidity (LockableColorPicker* picker, const rtengine::Coord &pos)

4
rtgui/cropwindow.h
View File

@ -106,7 +106,7 @@ class CropWindow : public LWButtonListener, public CropDisplayHandler, public Ed
void drawScaledSpotRectangle (Cairo::RefPtr<Cairo::Context> cr, int rectSize);
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 changeZoom (int zoom, bool notify = true, int centerx = -1, int centery = -1, bool needsRedraw = true);
void updateHoveredPicker (rtengine::Coord *imgPos = nullptr);
void cycleRGB ();
void cycleHSV ();
@ -176,7 +176,7 @@ public:
// zoomlistener interface
void zoomIn (bool toCursor = false, int cursorX = -1, int cursorY = -1);
void zoomOut (bool toCursor = false, int cursorX = -1, int cursorY = -1);
void zoom11 ();
void zoom11 (bool notify = true);
void zoomFit ();
void zoomFitCrop ();
double getZoom ();

2
rtgui/imagearea.cc
View File

@ -426,7 +426,7 @@ void ImageArea::addCropWindow ()
}
CropWindow* cw = new CropWindow (this, true, true);
cw->zoom11();
cw->zoom11(false);
cw->setCropGUIListener (cropgl);
cw->setPointerMotionListener (pmlistener);
cw->setPointerMotionHListener (pmhlistener);

4
rtgui/saveasdlg.cc
View File

@ -280,8 +280,6 @@ void SaveAsDialog::okPressed ()
void SaveAsDialog::cancelPressed ()
{
fname = fchooser->get_filename();
response (Gtk::RESPONSE_CANCEL);
}
@ -297,7 +295,7 @@ void SaveAsDialog::formatChanged (Glib::ustring f)
}
}
void SaveAsDialog::setInitialFileName (Glib::ustring fname)
void SaveAsDialog::setInitialFileName (const Glib::ustring& fname)
{
this->fname = fname;
fchooser->set_current_name(fname);

2
rtgui/saveasdlg.h
View File

@ -57,7 +57,7 @@ public:
bool getToTailOfQueue ();
int getSaveMethodNum ();
void setInitialFileName (Glib::ustring iname);
void setInitialFileName (const Glib::ustring& iname);
void setImagePath (const Glib::ustring& imagePath);
void okPressed ();