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

Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle

Browse Source
This commit is contained in:
DrSlony
2015-08-11 11:55:03 +02:00
parent effb46c3e1
commit 0e0cfb9b25
452 changed files with 133354 additions and 99460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

473
rtgui/thumbbrowserentrybase.cc
View File

@@ -7,7 +7,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -21,7 +21,7 @@
#include "options.h"
#include "../rtengine/mytime.h"
ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname)
ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname)
: fnlabw(0), fnlabh(0), dtlabw(0), dtlabh(0), exlabw(0), exlabh(0), prew(0), preh(0),
prex(0), prey(0), upperMargin(6), borderWidth(1), textGap(6), sideMargin(8), lowerMargin(8),
preview(NULL), dispname(Glib::path_get_basename (fname)), buttonSet(NULL), width(0), height(0),
@@ -31,36 +31,49 @@ ThumbBrowserEntryBase::ThumbBrowserEntryBase (const Glib::ustring& fname)
selected(false), drawable(false), filtered(false), framed(false), processing(false), italicstyle(false),
edited(false), recentlysaved(false), updatepriority(false), withFilename(WFNAME_NONE) {}
ThumbBrowserEntryBase::~ThumbBrowserEntryBase () {
ThumbBrowserEntryBase::~ThumbBrowserEntryBase ()
{
if (preview) {
delete [] preview;
}
if (preview) delete [] preview;
delete buttonSet;
}
void ThumbBrowserEntryBase::addButtonSet (LWButtonSet* bs) {
void ThumbBrowserEntryBase::addButtonSet (LWButtonSet* bs)
{
buttonSet = bs;
}
void ThumbBrowserEntryBase::updateBackBuffer () {
void ThumbBrowserEntryBase::updateBackBuffer ()
{
if (!parent)
if (!parent) {
return;
}
Gtk::Widget* w = parent->getDrawingArea ();
Glib::RefPtr<Gdk::Window> win = w->get_window();
if (!win)
// Nothing to draw on, so we return
{
return;
}
backBuffer = Gdk::Pixmap::create (win, exp_width, exp_height);
// If thumbnail is hidden by a filter drawing to it will crash
int backbuffer_w=0, backbuffer_h=0;
int backbuffer_w = 0, backbuffer_h = 0;
backBuffer->get_size(backbuffer_w, backbuffer_h);
// if either with or height is zero then return early
if (backbuffer_w * backbuffer_h == 0) return;
if (backbuffer_w * backbuffer_h == 0) {
return;
}
bbSelected = selected;
bbFramed = framed;
@@ -71,7 +84,7 @@ void ThumbBrowserEntryBase::updateBackBuffer () {
Gdk::Color textn = w->get_style()->get_text(Gtk::STATE_NORMAL);
Gdk::Color texts = w->get_style()->get_text(Gtk::STATE_SELECTED);
Gdk::Color bgn = w->get_style()->get_bg(Gtk::STATE_NORMAL);
Gdk::Color bgs = w->get_style()->get_bg(Gtk::STATE_SELECTED);
Gdk::Color bgs = w->get_style()->get_bg(Gtk::STATE_SELECTED);
// clear area, draw frames and background
gc_->set_foreground (bgn);
@@ -82,6 +95,7 @@ void ThumbBrowserEntryBase::updateBackBuffer () {
// calculate height of button set
int bsHeight = 0;
if (buttonSet) {
int tmp;
buttonSet->getAllocatedDimensions (tmp, bsHeight);
@@ -91,13 +105,13 @@ void ThumbBrowserEntryBase::updateBackBuffer () {
//backBuffer->draw_rectangle (gc_, false, (exp_width-prew)/2, upperMargin+bsHeight, prew+1, preh+1);
// draw thumbnail image
if (preview) {
prex = borderWidth + (exp_width-prew)/2;
prey = upperMargin+bsHeight+borderWidth;
backBuffer->draw_rgb_image (gc_, prex, prey, prew, preh, Gdk::RGB_DITHER_NONE, preview, prew*3);
prex = borderWidth + (exp_width - prew) / 2;
prey = upperMargin + bsHeight + borderWidth;
backBuffer->draw_rgb_image (gc_, prex, prey, prew, preh, Gdk::RGB_DITHER_NONE, preview, prew * 3);
}
customBackBufferUpdate (cr);
// draw icons onto the thumbnail area
bbIcons = getIconsOnImageArea ();
@@ -109,33 +123,40 @@ void ThumbBrowserEntryBase::updateBackBuffer () {
int istartx = prex;
int istarty = prey;
if ((parent->getLocation()!=ThumbBrowserBase::THLOC_EDITOR && options.showFileNames && options.overlayedFileNames)
|| (parent->getLocation()==ThumbBrowserBase::THLOC_EDITOR && options.filmStripShowFileNames && options.filmStripOverlayedFileNames)) {
if ((parent->getLocation() != ThumbBrowserBase::THLOC_EDITOR && options.showFileNames && options.overlayedFileNames)
|| (parent->getLocation() == ThumbBrowserBase::THLOC_EDITOR && options.filmStripShowFileNames && options.filmStripOverlayedFileNames)) {
cr->begin_new_path ();
cr->rectangle (istartx, istarty, prew, fnlabh+dtlabh+exlabh+2*iofs_y);
if ((texts.get_red_p()+texts.get_green_p()+texts.get_blue_p())/3 > 0.5)
cr->rectangle (istartx, istarty, prew, fnlabh + dtlabh + exlabh + 2 * iofs_y);
if ((texts.get_red_p() + texts.get_green_p() + texts.get_blue_p()) / 3 > 0.5) {
cr->set_source_rgba (0, 0, 0, 0.5);
else
} else {
cr->set_source_rgba (1, 1, 1, 0.5);
}
cr->fill ();
}
istartx += iofs_x;
istarty += iofs_y;
if (!bbIcons.empty()) {
int iwidth = 0;
int iheight = 0;
for (size_t i=0; i<bbIcons.size(); i++) {
iwidth += bbIcons[i]->get_width() + (i>0 ? igap : 0);
if (bbIcons[i]->get_height() > iheight)
for (size_t i = 0; i < bbIcons.size(); i++) {
iwidth += bbIcons[i]->get_width() + (i > 0 ? igap : 0);
if (bbIcons[i]->get_height() > iheight) {
iheight = bbIcons[i]->get_height();
}
}
if ((parent->getLocation()!=ThumbBrowserBase::THLOC_EDITOR && (!options.showFileNames || !options.overlayedFileNames))
|| (parent->getLocation()==ThumbBrowserBase::THLOC_EDITOR && (!options.filmStripShowFileNames || !options.filmStripOverlayedFileNames))) {
if ((parent->getLocation() != ThumbBrowserBase::THLOC_EDITOR && (!options.showFileNames || !options.overlayedFileNames))
|| (parent->getLocation() == ThumbBrowserBase::THLOC_EDITOR && (!options.filmStripShowFileNames || !options.filmStripOverlayedFileNames))) {
// Draw the transparent black background around icons
cr->begin_new_path ();
cr->move_to(istartx-igap, istarty);
cr->move_to(istartx - igap, istarty);
cr->rel_line_to(igap, -igap);
cr->rel_line_to(iwidth, 0);
cr->rel_line_to(igap, igap);
@@ -147,85 +168,102 @@ void ThumbBrowserEntryBase::updateBackBuffer () {
cr->set_source_rgba (0, 0, 0, 0.6);
cr->fill ();
}
for (size_t i=0; i<bbIcons.size(); i++) {
for (size_t i = 0; i < bbIcons.size(); i++) {
backBuffer->draw_pixbuf (gc_, bbIcons[i], 0, 0, istartx, istarty, bbIcons[i]->get_width(), bbIcons[i]->get_height(), Gdk::RGB_DITHER_NONE, 0, 0);
istartx += bbIcons[i]->get_width() + igap;
}
}
if ( ( (parent->getLocation()!=ThumbBrowserBase::THLOC_EDITOR && options.showFileNames)
|| (parent->getLocation()==ThumbBrowserBase::THLOC_EDITOR && options.filmStripShowFileNames))
&& withFilename>WFNAME_NONE)
{
int textposx_fn, textposx_ex, textposx_dt, textposy, textw;
if (! ((parent->getLocation()!=ThumbBrowserBase::THLOC_EDITOR && options.overlayedFileNames)
|| (parent->getLocation()==ThumbBrowserBase::THLOC_EDITOR && options.filmStripOverlayedFileNames)) )
{
textposx_fn = exp_width/2 - fnlabw/2;
if (textposx_fn<0) textposx_fn = 0;
textposx_ex = exp_width/2 - exlabw/2;
if (textposx_ex<0) textposx_ex = 0;
textposx_dt = exp_width/2 - dtlabw/2;
if (textposx_dt<0) textposx_dt = 0;
textposy = upperMargin + bsHeight + 2*borderWidth + preh + borderWidth + textGap;
textw = exp_width - 2*textGap;
gc_->set_foreground (selected ? texts : textn);
}
else {
textposx_fn = istartx;
textposx_ex = istartx;
textposx_dt = istartx;
textposy = istarty;
textw = prew - (istartx - prex);
gc_->set_foreground (texts);
}
if ( ( (parent->getLocation() != ThumbBrowserBase::THLOC_EDITOR && options.showFileNames)
|| (parent->getLocation() == ThumbBrowserBase::THLOC_EDITOR && options.filmStripShowFileNames))
&& withFilename > WFNAME_NONE) {
int textposx_fn, textposx_ex, textposx_dt, textposy, textw;
// draw file name
Glib::RefPtr<Pango::Context> context = w->get_pango_context () ;
Pango::FontDescription fontd = context->get_font_description ();
fontd.set_weight (Pango::WEIGHT_BOLD);
if (italicstyle)
fontd.set_style (Pango::STYLE_ITALIC);
else
fontd.set_style (Pango::STYLE_NORMAL);
if (! ((parent->getLocation() != ThumbBrowserBase::THLOC_EDITOR && options.overlayedFileNames)
|| (parent->getLocation() == ThumbBrowserBase::THLOC_EDITOR && options.filmStripOverlayedFileNames)) ) {
textposx_fn = exp_width / 2 - fnlabw / 2;
context->set_font_description (fontd);
Glib::RefPtr<Pango::Layout> fn = w->create_pango_layout (dispname);
fn->set_width (textw*Pango::SCALE);
fn->set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
backBuffer->draw_layout(gc_, textposx_fn, textposy, fn);
if (textposx_fn < 0) {
textposx_fn = 0;
}
fontd.set_weight (Pango::WEIGHT_NORMAL);
fontd.set_style (Pango::STYLE_NORMAL);
context->set_font_description (fontd);
textposx_ex = exp_width / 2 - exlabw / 2;
if (withFilename==WFNAME_FULL) {
// draw date/time label
int tpos = fnlabh;
if (options.fbShowDateTime && datetimeline!="") {
fn = w->create_pango_layout (datetimeline);
fn->set_width (textw*Pango::SCALE);
fn->set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
backBuffer->draw_layout(gc_, textposx_dt, textposy + tpos, fn);
tpos += dtlabh;
}
// draw basic exif info
if (options.fbShowBasicExif && exifline!="") {
fn = w->create_pango_layout (exifline);
fn->set_width (textw*Pango::SCALE);
fn->set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
backBuffer->draw_layout (gc_, textposx_ex, textposy + tpos, fn);
tpos += exlabh;
}
}
}
if (textposx_ex < 0) {
textposx_ex = 0;
}
textposx_dt = exp_width / 2 - dtlabw / 2;
if (textposx_dt < 0) {
textposx_dt = 0;
}
textposy = upperMargin + bsHeight + 2 * borderWidth + preh + borderWidth + textGap;
textw = exp_width - 2 * textGap;
gc_->set_foreground (selected ? texts : textn);
} else {
textposx_fn = istartx;
textposx_ex = istartx;
textposx_dt = istartx;
textposy = istarty;
textw = prew - (istartx - prex);
gc_->set_foreground (texts);
}
// draw file name
Glib::RefPtr<Pango::Context> context = w->get_pango_context () ;
Pango::FontDescription fontd = context->get_font_description ();
fontd.set_weight (Pango::WEIGHT_BOLD);
if (italicstyle) {
fontd.set_style (Pango::STYLE_ITALIC);
} else {
fontd.set_style (Pango::STYLE_NORMAL);
}
context->set_font_description (fontd);
Glib::RefPtr<Pango::Layout> fn = w->create_pango_layout (dispname);
fn->set_width (textw * Pango::SCALE);
fn->set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
backBuffer->draw_layout(gc_, textposx_fn, textposy, fn);
fontd.set_weight (Pango::WEIGHT_NORMAL);
fontd.set_style (Pango::STYLE_NORMAL);
context->set_font_description (fontd);
if (withFilename == WFNAME_FULL) {
// draw date/time label
int tpos = fnlabh;
if (options.fbShowDateTime && datetimeline != "") {
fn = w->create_pango_layout (datetimeline);
fn->set_width (textw * Pango::SCALE);
fn->set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
backBuffer->draw_layout(gc_, textposx_dt, textposy + tpos, fn);
tpos += dtlabh;
}
// draw basic exif info
if (options.fbShowBasicExif && exifline != "") {
fn = w->create_pango_layout (exifline);
fn->set_width (textw * Pango::SCALE);
fn->set_ellipsize (Pango::ELLIPSIZE_MIDDLE);
backBuffer->draw_layout (gc_, textposx_ex, textposy + tpos, fn);
tpos += exlabh;
}
}
}
}
void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh) {
void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh)
{
if (!parent)
if (!parent) {
return;
}
Gtk::Widget* w = parent->getDrawingArea ();
// calculate dimensions of the text based fields
@@ -233,9 +271,9 @@ void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh) {
Glib::RefPtr<Pango::Context> context = w->get_pango_context () ;
context->set_font_description (w->get_style()->get_font());
// filename:
Pango::FontDescription fontd = context->get_font_description ();
Pango::FontDescription fontd = context->get_font_description ();
fontd.set_weight (Pango::WEIGHT_BOLD);
context->set_font_description (fontd);
Glib::RefPtr<Pango::Layout> fn = w->create_pango_layout(shortname);
@@ -245,7 +283,7 @@ void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh) {
infoh = fnlabh;
infow = 0;
if (withFilename==WFNAME_FULL) {
if (withFilename == WFNAME_FULL) {
// datetime
fontd.set_weight (Pango::WEIGHT_NORMAL);
context->set_font_description (fontd);
@@ -259,160 +297,178 @@ void ThumbBrowserEntryBase::getTextSizes (int& infow, int& infoh) {
// add date/tile size:
if (options.fbShowDateTime) {
infoh += dtlabh;
if (dtlabw + 2*sideMargin > infow)
infow = dtlabw + 2*sideMargin;
}
else {
if (dtlabw + 2 * sideMargin > infow) {
infow = dtlabw + 2 * sideMargin;
}
} else {
dtlabw = dtlabh = 0;
}
if (options.fbShowBasicExif) {
infoh += exlabh;
if (exlabw + 2*sideMargin > infow)
infow = exlabw + 2*sideMargin;
}
else {
if (exlabw + 2 * sideMargin > infow) {
infow = exlabw + 2 * sideMargin;
}
} else {
exlabw = exlabh = 0;
}
}
else {
} else {
dtlabw = dtlabh = exlabw = exlabh = 0;
}
}
void ThumbBrowserEntryBase::resize (int h) {
void ThumbBrowserEntryBase::resize (int h)
{
#if PROTECT_VECTORS
#if PROTECT_VECTORS
MYWRITERLOCK(l, lockRW);
#endif
#endif
height = h;
int old_preh = preh, old_width = width;
// dimensions of the button set
int bsw=0, bsh=0;
if (buttonSet)
int bsw = 0, bsh = 0;
if (buttonSet) {
buttonSet->getMinimalDimensions (bsw, bsh);
}
if (parent->getLocation() == ThumbBrowserBase::THLOC_FILEBROWSER) {
if (options.showFileNames)
if (options.showFileNames) {
withFilename = WFNAME_FULL;
else
} else {
withFilename = WFNAME_NONE;
}
else if (parent->getLocation() == ThumbBrowserBase::THLOC_BATCHQUEUE) {
}
} else if (parent->getLocation() == ThumbBrowserBase::THLOC_BATCHQUEUE) {
withFilename = WFNAME_REDUCED;
}
else {
if (options.filmStripShowFileNames)
} else {
if (options.filmStripShowFileNames) {
withFilename = WFNAME_REDUCED;
else
} else {
withFilename = WFNAME_NONE;
}
}
// calculate the height remaining for the thumbnail image
preh = height - upperMargin - 2*borderWidth - lowerMargin - bsh;
int infow=0;
int infoh=0;
if ( (parent->getLocation()!=ThumbBrowserBase::THLOC_EDITOR && options.showFileNames && !options.overlayedFileNames)
|| (parent->getLocation()==ThumbBrowserBase::THLOC_EDITOR && options.filmStripShowFileNames && !options.filmStripOverlayedFileNames))
{
preh = height - upperMargin - 2 * borderWidth - lowerMargin - bsh;
int infow = 0;
int infoh = 0;
if ( (parent->getLocation() != ThumbBrowserBase::THLOC_EDITOR && options.showFileNames && !options.overlayedFileNames)
|| (parent->getLocation() == ThumbBrowserBase::THLOC_EDITOR && options.filmStripShowFileNames && !options.filmStripOverlayedFileNames)) {
// dimensions of the info text
getTextSizes (infow, infoh);
infoh += textGap;
//preh -= infoh;
height += infoh;
}
// Minimum size for thumbs
if (preh<24){
preh=24;
height = preh + (upperMargin + 2*borderWidth + lowerMargin)+ bsh + infoh;
if (preh < 24) {
preh = 24;
height = preh + (upperMargin + 2 * borderWidth + lowerMargin) + bsh + infoh;
}
calcThumbnailSize (); // recalculates prew
width = prew + 2*sideMargin + 2*borderWidth;
if ( (parent->getLocation()!=ThumbBrowserBase::THLOC_EDITOR && options.showFileNames && !options.overlayedFileNames)
|| (parent->getLocation()==ThumbBrowserBase::THLOC_EDITOR && options.filmStripShowFileNames && !options.filmStripOverlayedFileNames))
{
width = prew + 2*sideMargin + 2*borderWidth;
if (width<infow + 2*sideMargin + 2*borderWidth)
width = infow + 2*sideMargin + 2*borderWidth;
}
if (width < bsw + 2*sideMargin + 2*borderWidth)
width = bsw + 2*sideMargin + 2*borderWidth;
width = prew + 2 * sideMargin + 2 * borderWidth;
if ( preh != old_preh || width != old_width )
{
if ( (parent->getLocation() != ThumbBrowserBase::THLOC_EDITOR && options.showFileNames && !options.overlayedFileNames)
|| (parent->getLocation() == ThumbBrowserBase::THLOC_EDITOR && options.filmStripShowFileNames && !options.filmStripOverlayedFileNames)) {
width = prew + 2 * sideMargin + 2 * borderWidth;
if (width < infow + 2 * sideMargin + 2 * borderWidth) {
width = infow + 2 * sideMargin + 2 * borderWidth;
}
}
if (width < bsw + 2 * sideMargin + 2 * borderWidth) {
width = bsw + 2 * sideMargin + 2 * borderWidth;
}
if ( preh != old_preh || width != old_width ) {
delete [] preview;
preview = NULL;
refreshThumbnailImage ();
} else {
backBuffer.clear(); // This will force a backBuffer update on queue_draw
}
else
backBuffer.clear(); // This will force a backBuffer update on queue_draw
drawable = true;
}
void ThumbBrowserEntryBase::drawFrame (Cairo::RefPtr<Cairo::Context> cr, const Gdk::Color& bg, const Gdk::Color& fg) {
void ThumbBrowserEntryBase::drawFrame (Cairo::RefPtr<Cairo::Context> cr, const Gdk::Color& bg, const Gdk::Color& fg)
{
int radius = 8;
if (selected || framed) {
cr->set_antialias (Cairo::ANTIALIAS_SUBPIXEL);
cr->move_to (radius, 0);
cr->arc (exp_width-1-radius, radius, radius, -M_PI/2, 0);
cr->arc (exp_width-1-radius, exp_height-1-radius, radius, 0, M_PI/2);
cr->arc (radius, exp_height-1-radius, radius, M_PI/2, M_PI);
cr->arc (radius, radius, radius, M_PI, -M_PI/2);
cr->arc (exp_width - 1 - radius, radius, radius, -M_PI / 2, 0);
cr->arc (exp_width - 1 - radius, exp_height - 1 - radius, radius, 0, M_PI / 2);
cr->arc (radius, exp_height - 1 - radius, radius, M_PI / 2, M_PI);
cr->arc (radius, radius, radius, M_PI, -M_PI / 2);
cr->close_path ();
if (selected) {
cr->set_source_rgb (bg.get_red_p(), bg.get_green_p(), bg.get_blue_p());
cr->fill_preserve ();
}
cr->set_source_rgb (bg.get_red_p()*2/3, bg.get_green_p()*2/3, bg.get_blue_p()*2/3);
cr->set_source_rgb (bg.get_red_p() * 2 / 3, bg.get_green_p() * 2 / 3, bg.get_blue_p() * 2 / 3);
cr->set_line_width (1.0);
cr->stroke ();
}
if (framed) {
cr->set_antialias (Cairo::ANTIALIAS_SUBPIXEL);
cr->move_to (+2+0.5+radius, +2+0.5);
cr->arc (-2+0.5+exp_width-1-radius, +2+0.5+radius, radius, -M_PI/2, 0);
cr->arc (-2+0.5+exp_width-1-radius, -2+0.5+exp_height-1-radius, radius, 0, M_PI/2);
cr->arc (+2+0.5+radius, -2+exp_height-1-radius, radius, M_PI/2, M_PI);
cr->arc (+2+0.5+radius, +2+radius, radius, M_PI, -M_PI/2);
cr->move_to (+2 + 0.5 + radius, +2 + 0.5);
cr->arc (-2 + 0.5 + exp_width - 1 - radius, +2 + 0.5 + radius, radius, -M_PI / 2, 0);
cr->arc (-2 + 0.5 + exp_width - 1 - radius, -2 + 0.5 + exp_height - 1 - radius, radius, 0, M_PI / 2);
cr->arc (+2 + 0.5 + radius, -2 + exp_height - 1 - radius, radius, M_PI / 2, M_PI);
cr->arc (+2 + 0.5 + radius, +2 + radius, radius, M_PI, -M_PI / 2);
cr->close_path ();
cr->set_source_rgb (fg.get_red_p(), fg.get_green_p(), fg.get_blue_p());
cr->set_line_width (2.0);
cr->stroke ();
}
}
}
void ThumbBrowserEntryBase::draw () {
void ThumbBrowserEntryBase::draw ()
{
if (!drawable || !parent)
if (!drawable || !parent) {
return;
}
#if PROTECT_VECTORS
#if PROTECT_VECTORS
MYREADERLOCK(l, lockRW); // No resizes, position moves etc. inbetween
#endif
#endif
int bbWidth, bbHeight;
if (backBuffer)
backBuffer->get_size (bbWidth, bbHeight);
if (!backBuffer || selected!=bbSelected || framed!=bbFramed || preview!=bbPreview
|| exp_width!=bbWidth || exp_height!=bbHeight || getIconsOnImageArea ()!=bbIcons)
if (backBuffer) {
backBuffer->get_size (bbWidth, bbHeight);
}
if (!backBuffer || selected != bbSelected || framed != bbFramed || preview != bbPreview
|| exp_width != bbWidth || exp_height != bbHeight || getIconsOnImageArea () != bbIcons) {
updateBackBuffer ();
}
Gtk::Widget* w = parent->getDrawingArea ();
Glib::RefPtr<Gdk::GC> gc_ = Gdk::GC::create (w->get_window());
// Gdk::Color textn = w->get_style()->get_text(Gtk::STATE_NORMAL);
// Gdk::Color texts = w->get_style()->get_text(Gtk::STATE_SELECTED);
// Gdk::Color textn = w->get_style()->get_text(Gtk::STATE_NORMAL);
// Gdk::Color texts = w->get_style()->get_text(Gtk::STATE_SELECTED);
Gdk::Color bgn = w->get_style()->get_bg(Gtk::STATE_NORMAL);
Gdk::Color bgs = w->get_style()->get_bg(Gtk::STATE_SELECTED);
Gdk::Color bgs = w->get_style()->get_bg(Gtk::STATE_SELECTED);
w->get_window()->draw_drawable (gc_, backBuffer, 0, 0, startx + ofsX, starty + ofsY);
@@ -420,7 +476,7 @@ void ThumbBrowserEntryBase::draw () {
// drawProgressBar (window, gc_, selected ? texts : textn, selected ? bgs : bgn, ofsX+startx, exp_width, ofsY+starty + upperMargin+bsHeight+borderWidth+preh+borderWidth+textGap+tpos, fnlabh);
// redraw button set above the thumbnail
// redraw button set above the thumbnail
if (buttonSet) {
buttonSet->setColors (selected ? bgs : bgn, selected ? bgn : bgs);
Cairo::RefPtr<Cairo::Context> cc = w->get_window()->create_cairo_context();
@@ -428,82 +484,103 @@ void ThumbBrowserEntryBase::draw () {
}
}
void ThumbBrowserEntryBase::setPosition (int x, int y, int w, int h) {
void ThumbBrowserEntryBase::setPosition (int x, int y, int w, int h)
{
#if PROTECT_VECTORS
#if PROTECT_VECTORS
MYWRITERLOCK(l, lockRW);
#endif
#endif
exp_width = w;
exp_height = h;
startx = x;
starty = y;
if (buttonSet)
buttonSet->arrangeButtons (ofsX+x+sideMargin, ofsY+y+upperMargin, w-2*sideMargin, -1);
if (buttonSet) {
buttonSet->arrangeButtons (ofsX + x + sideMargin, ofsY + y + upperMargin, w - 2 * sideMargin, -1);
}
}
void ThumbBrowserEntryBase::setOffset (int x, int y) {
void ThumbBrowserEntryBase::setOffset (int x, int y)
{
#if PROTECT_VECTORS
#if PROTECT_VECTORS
MYWRITERLOCK(l, lockRW);
#endif
#endif
ofsX = -x;
ofsY = -y;
if (buttonSet)
buttonSet->move (ofsX+startx+sideMargin, ofsY+starty+upperMargin);
if (buttonSet) {
buttonSet->move (ofsX + startx + sideMargin, ofsY + starty + upperMargin);
}
}
bool ThumbBrowserEntryBase::inside (int x, int y) {
bool ThumbBrowserEntryBase::inside (int x, int y)
{
return x>ofsX+startx && x<ofsX+startx+exp_width && y>ofsY+starty && y<ofsY+starty+exp_height;
return x > ofsX + startx && x < ofsX + startx + exp_width && y > ofsY + starty && y < ofsY + starty + exp_height;
}
void ThumbBrowserEntryBase::getPosInImgSpace (int x, int y, rtengine::Coord2D &coord) {
void ThumbBrowserEntryBase::getPosInImgSpace (int x, int y, rtengine::Coord2D &coord)
{
coord.x = coord.y = -1.;
if (preview) {
x -= ofsX+startx;
y -= ofsY+starty;
if (x>=prex && x<=prex+prew && y>=prey && y<=prey+preh) {
coord.x = double(x-prex)/double(prew);
coord.y = double(y-prey)/double(preh);
x -= ofsX + startx;
y -= ofsY + starty;
if (x >= prex && x <= prex + prew && y >= prey && y <= prey + preh) {
coord.x = double(x - prex) / double(prew);
coord.y = double(y - prey) / double(preh);
}
}
}
bool ThumbBrowserEntryBase::insideWindow (int x, int y, int w, int h) {
bool ThumbBrowserEntryBase::insideWindow (int x, int y, int w, int h)
{
return !(ofsX+startx>x+w || ofsX+startx+exp_width<x || ofsY+starty>y+h || ofsY+starty+exp_height<y);
}
return !(ofsX + startx > x + w || ofsX + startx + exp_width < x || ofsY + starty > y + h || ofsY + starty + exp_height < y);
}
bool ThumbBrowserEntryBase::motionNotify (int x, int y) {
bool ThumbBrowserEntryBase::motionNotify (int x, int y)
{
return buttonSet ? buttonSet->motionNotify (x, y) : false;
}
bool ThumbBrowserEntryBase::pressNotify (int button, int type, int bstate, int x, int y) {
bool ThumbBrowserEntryBase::pressNotify (int button, int type, int bstate, int x, int y)
{
return buttonSet ? buttonSet->pressNotify (x, y) : false;
}
bool ThumbBrowserEntryBase::releaseNotify (int button, int type, int bstate, int x, int y) {
bool ThumbBrowserEntryBase::releaseNotify (int button, int type, int bstate, int x, int y)
{
return buttonSet ? buttonSet->releaseNotify (x, y) : false;
}
Glib::ustring ThumbBrowserEntryBase::getToolTip (int x, int y) {
Glib::ustring ThumbBrowserEntryBase::getToolTip (int x, int y)
{
Glib::ustring tooltip = "";
if (buttonSet) tooltip = buttonSet->getToolTip (x, y);
if (buttonSet) {
tooltip = buttonSet->getToolTip (x, y);
}
// if the fileinfo is not shown anyway, make a tooltip with the info
if (withFilename<WFNAME_FULL && inside(x,y) && tooltip.empty()) {
if (withFilename < WFNAME_FULL && inside(x, y) && tooltip.empty()) {
tooltip = dispname;
if (options.fbShowDateTime && datetimeline!="") tooltip += Glib::ustring("\n") + datetimeline;
if (options.fbShowBasicExif && exifline!="") tooltip += Glib::ustring("\n") + exifline;
if (options.fbShowDateTime && datetimeline != "") {
tooltip += Glib::ustring("\n") + datetimeline;
}
if (options.fbShowBasicExif && exifline != "") {
tooltip += Glib::ustring("\n") + exifline;
}
}
return tooltip;