Removed Windows-style line breaks (^M) from all .cc and .h source files.
This commit is contained in:
@@ -157,7 +157,7 @@ void ThumbBrowserEntryBase::updateBackBuffer () {
|
||||
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);
|
||||
gc_->set_foreground (selected ? texts : textn);
|
||||
}
|
||||
else {
|
||||
textposx_fn = istartx;
|
||||
@@ -165,45 +165,45 @@ void ThumbBrowserEntryBase::updateBackBuffer () {
|
||||
textposx_dt = istartx;
|
||||
textposy = istarty;
|
||||
textw = prew - (istartx - prex);
|
||||
gc_->set_foreground (texts);
|
||||
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);
|
||||
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);
|
||||
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);
|
||||
|
||||
// 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;
|
||||
}
|
||||
fontd.set_weight (Pango::WEIGHT_NORMAL);
|
||||
fontd.set_style (Pango::STYLE_NORMAL);
|
||||
context->set_font_description (fontd);
|
||||
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -275,7 +275,7 @@ void ThumbBrowserEntryBase::resize (int h) {
|
||||
|
||||
calcThumbnailSize ();
|
||||
width = prew + 2*sideMargin + 2*borderWidth;
|
||||
if (options.showFileNames && !options.overlayedFileNames) {
|
||||
if (options.showFileNames && !options.overlayedFileNames) {
|
||||
width = prew + 2*sideMargin + 2*borderWidth;
|
||||
if (width<infow + 2*sideMargin + 2*borderWidth)
|
||||
width = infow + 2*sideMargin + 2*borderWidth;
|
||||
|
Reference in New Issue
Block a user