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

Gtk3 by Hombre, issue 2807

Browse Source
This commit is contained in:
Morgan Hardwood
2015-08-12 16:07:19 +02:00
parent 91f67f0cb6
commit 56a0805bc7
133 changed files with 3950 additions and 2626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
rtgui/previewwindow.cc
View File

@@ -21,9 +21,12 @@
#include "imagearea.h"
#include "cursormanager.h"
PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL), imageArea(NULL), imgX(0), imgY(0), imgW(0), imgH(0), zoom(0.0), isMoving(false), needsUpdate(false)
PreviewWindow::PreviewWindow () : previewHandler(NULL), mainCropWin(NULL), imageArea(NULL), imgX(0), imgY(0), imgW(0), imgH(0),
zoom(0.0), isMoving(false), needsUpdate(false), cursor_type(CSUndefined)
{
Glib::RefPtr<Gtk::StyleContext> style = get_style_context();
style->add_class(GTK_STYLE_CLASS_BACKGROUND);
style->add_class(GTK_STYLE_CLASS_FLAT);
rconn = signal_size_allocate().connect( sigc::mem_fun(*this, &PreviewWindow::on_resized) );
}
@@ -31,7 +34,7 @@ void PreviewWindow::on_realize ()
{
Gtk::DrawingArea::on_realize ();
add_events(Gdk::EXPOSURE_MASK | Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK);
add_events(Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK | Gdk::SCROLL_MASK);
}
void PreviewWindow::getObservedFrameArea (int& x, int& y, int& w, int& h)
@@ -59,8 +62,14 @@ void PreviewWindow::updatePreviewImage ()
return;
}
backBuffer = Gdk::Pixmap::create (wind, W, H, -1);
backBuffer->draw_rectangle (get_style()->get_base_gc(Gtk::STATE_NORMAL), true, 0, 0, W, H);
backBuffer = Cairo::RefPtr<BackBuffer> ( new BackBuffer(W, H, wind) );
Cairo::RefPtr<Cairo::ImageSurface> surface = backBuffer->getSurface();
Glib::RefPtr<Gtk::StyleContext> style = get_style_context();
Cairo::RefPtr<Cairo::Context> cc = Cairo::Context::create(surface);
style->render_background(cc, 0, 0, W, H);
Gdk::RGBA c = style->get_background_color(Gtk::STATE_FLAG_NORMAL);
cc->set_antialias(Cairo::ANTIALIAS_NONE);
cc->set_line_join(Cairo::LINE_JOIN_MITER);
if (previewHandler) {
Glib::RefPtr<Gdk::Pixbuf> resPixbuf = previewHandler->getRoughImage (W, H, zoom);
@@ -70,11 +79,12 @@ void PreviewWindow::updatePreviewImage ()
imgH = resPixbuf->get_height();
imgX = (W - imgW) / 2;
imgY = (H - imgH) / 2;
backBuffer->draw_pixbuf (get_style()->get_base_gc(Gtk::STATE_NORMAL), resPixbuf, 0, 0, imgX, imgY, -1, -1, Gdk::RGB_DITHER_NONE, 0, 0);
Cairo::RefPtr<Cairo::Context> cr = backBuffer->create_cairo_context();
Gdk::Cairo::set_source_pixbuf(cc, resPixbuf, imgX, imgY);
cc->rectangle(imgX, imgY, imgW, imgH);
cc->fill();
if (previewHandler->getCropParams().enabled) {
drawCrop (cr, imgX, imgY, imgW, imgH, 0, 0, zoom, previewHandler->getCropParams(), true, false);
drawCrop (cc, imgX, imgY, imgW, imgH, 0, 0, zoom, previewHandler->getCropParams(), true, false);
}
}
}
@@ -97,14 +107,13 @@ void PreviewWindow::on_resized (Gtk::Allocation& req)
queue_draw ();
}
bool PreviewWindow::on_expose_event (GdkEventExpose* event)
bool PreviewWindow::on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr)
{
if (backBuffer) {
Glib::RefPtr<Gdk::Window> window = get_window();
int bufferW, bufferH;
backBuffer->get_size (bufferW, bufferH);
bufferW = backBuffer->getWidth();
bufferH = backBuffer->getHeight();
if (!mainCropWin && imageArea) {
mainCropWin = imageArea->getMainCropWindow ();
@@ -119,11 +128,10 @@ bool PreviewWindow::on_expose_event (GdkEventExpose* event)
updatePreviewImage ();
}
window->draw_drawable (get_style()->get_base_gc(Gtk::STATE_NORMAL), backBuffer, 0, 0, 0, 0, -1, -1);
backBuffer->copySurface(cr, NULL);
if (mainCropWin && zoom > 0.0) {
if(mainCropWin->getZoom() > mainCropWin->cropHandler.getFitZoom()) {
Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context();
int x, y, w, h;
getObservedFrameArea (x, y, w, h);
double rectX = x + 0.5;
@@ -133,7 +141,8 @@ bool PreviewWindow::on_expose_event (GdkEventExpose* event)
// draw a black "shadow" line
cr->set_source_rgba (0.0, 0.0, 0.0, 0.65);
cr->set_line_width (1);
cr->set_line_width (1.);
cr->set_line_join(Cairo::LINE_JOIN_MITER);
cr->rectangle (rectX + 1., rectY + 1, rectW, rectH);
cr->stroke ();
@@ -191,18 +200,26 @@ bool PreviewWindow::on_motion_notify_event (GdkEventMotion* event)
return true;
}
if(mainCropWin->getZoom() > mainCropWin->cropHandler.getFitZoom()) {
int x, y, w, h;
getObservedFrameArea (x, y, w, h);
bool inside = event->x > x - 6 && event->x < x + w - 1 + 6 && event->y > y - 6 && event->y < y + h - 1 + 6;
bool moreInside = event->x > x + 6 && event->x < x + w - 1 - 6 && event->y > y + 6 && event->y < y + h - 1 - 6;
CursorShape newType = cursor_type;
if (isMoving) {
mainCropWin->remoteMove ((event->x - press_x) / zoom, (event->y - press_y) / zoom);
} else if (inside && !moreInside) {
cursorManager.setCursor (get_window(), CSClosedHand);
newType = CSClosedHand;
} else {
cursorManager.setCursor (get_window(), CSArrow);
newType = CSArrow;
}
if (newType != cursor_type) {
cursor_type = newType;
CursorManager::setWidgetCursor(get_window(), cursor_type);
}
}
@@ -234,7 +251,10 @@ bool PreviewWindow::on_button_press_event (GdkEventButton* event)
press_y = event->y;
}
cursorManager.setCursor (get_window(), CSClosedHand);
if (cursor_type != CSClosedHand) {
cursor_type = CSClosedHand;
CursorManager::setWidgetCursor(get_window(), cursor_type);
}
}
}
@@ -250,7 +270,12 @@ bool PreviewWindow::on_button_release_event (GdkEventButton* event)
if (isMoving) {
isMoving = false;
cursorManager.setCursor (get_window(), CSArrow);
if (cursor_type != CSArrow) {
cursor_type = CSArrow;
CursorManager::setWidgetCursor(get_window(), cursor_type);
}
mainCropWin->remoteMoveReady ();
}