mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Show thumbnails for text files under GTK2

Browse source 
UPD: Don't stretch and cache small bitmaps
This commit is contained in:
Alexander Koblov 2013-01-19 12:08:32 +00:00
commit e1ba2bb2da
2 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/uresample.pas
View file

@ -7,7 +7,7 @@
// Date: 19-DEC-2009
// Target: Free Pascal 2.2.4, Lazarus 0.9.29
// Author(s): anme: Anders Melander, anders@melander.dk
// Alexx2000: Alexander Koblov, Alexx2000@mail.ru
// Alexx2000: Alexander Koblov, Alexx2000@mail.ru
// Copyright (c) 1997,98 by Anders Melander
// Copyright (c) 2009 by Alexander Koblov
// Formatting: 2 space indent, 8 space tabs, 80 columns.
@ -389,8 +389,8 @@ begin
if Src.RawImage.Description.AlphaPrec = 0 then // if bitmap has not alpha channel
SrcIntfImage := CreateAlphaFromMask(Src)
else
SrcIntfImage := Src.CreateIntfImage;
DstIntfImage := Dst.CreateIntfImage;
SrcIntfImage := TLazIntfImage.Create(Src.RawImage, False);
DstIntfImage := TLazIntfImage.Create(Dst.RawImage, False);
ImgFormatDescription.Init_BPP32_B8G8R8A8_BIO_TTB(DstWidth, DstHeight);
DstIntfImage.DataDescription := ImgFormatDescription;
{++++++++++++++++++++}

42
src/uthumbnails.pas
View file

@ -21,13 +21,16 @@ type
TThumbnailManager = class
private
FThumbPath: UTF8String;
FBitmap: TBitmap;
FBackColor: TColor;
FFileName: UTF8String;
FThumbPath: UTF8String;
FProviderList: array of TCreatePreviewHandler; static;
private
procedure DoCreatePreviewText;
function GetPreviewFileExt(const sFileExt: UTF8String): UTF8String;
function GetPreviewFileName(const sFileName: UTF8String): UTF8String;
function CreatePreviewImage(const Graphic: TGraphic): TBitmap;
function CreatePreviewText(const sFileName: UTF8String): TBitmap;
function ReadMetaData(const aFile: TFile; FileStream: TFileStreamEx): Boolean;
function WriteMetaData(const aFile: TFile; FileStream: TFileStreamEx): Boolean;
class function ReadFileName(const aThumb: UTF8String; out aFileName: UTF8String): Boolean;
@ -44,7 +47,7 @@ type
implementation
uses
LCLProc, FileUtil, uDebug, DCOSUtils, uFileProcs, DCStrUtils, uReSample,
LCLProc, FileUtil, Forms, uDebug, DCOSUtils, uFileProcs, DCStrUtils, uReSample,
uGlobsPaths, uGlobs, uPixmapManager, URIParser, md5, uFileSystemFileSource;
const
@ -95,23 +98,22 @@ begin
end;
end;
function TThumbnailManager.CreatePreviewText(const sFileName: UTF8String): TBitmap;
procedure TThumbnailManager.DoCreatePreviewText;
var
x: LongInt;
ARect: TRect;
sStr: String;
tFile: THandle;
begin
Result:= TBitmap.Create;
ARect:= Rect(0, 0, gThumbSize.cx, gThumbSize.cy);
with Result do
FBitmap:= TBitmap.Create;
with FBitmap do
begin
SetSize(gThumbSize.cx, gThumbSize.cy);
Canvas.Brush.Color:= clWhite;
Canvas.FillRect(ARect);
Canvas.FillRect(Canvas.ClipRect);
Canvas.Font.Color:= clBlack;
Canvas.Font.Size := gThumbSize.cy div 16;
tFile:= mbFileOpen(sFileName, fmOpenRead or fmShareDenyNone);
tFile:= mbFileOpen(FFileName, fmOpenRead or fmShareDenyNone);
if (tFile <> feInvalidHandle) then
begin
for x:= 0 to 8 do
@ -121,6 +123,7 @@ begin
end;
FileClose(tFile);
end;
Application.ProcessMessages;
end;
end;
@ -249,9 +252,17 @@ begin
if GetGraphicClassForFileExtension(sExt) <> nil then
begin
fsFileStream:= TFileStreamEx.Create(sFullPathToFile, fmOpenRead or fmShareDenyNone);
with Picture do
try
Picture.LoadFromStreamWithFileExt(fsFileStream, sExt);
Result:= CreatePreviewImage(Picture.Graphic);
LoadFromStreamWithFileExt(fsFileStream, sExt);
if (Graphic.Width > gThumbSize.cx) or (Graphic.Height > gThumbSize.cy) then
Result:= CreatePreviewImage(Graphic)
else
begin
Result:= TBitmap.Create;
Result.Assign(Graphic);
Exit; // No need to save in cache
end;
finally
FreeAndNil(fsFileStream);
end
@ -259,8 +270,11 @@ begin
// Create thumb for text files
else if (mbFileAccess(sFullPathToFile, fmOpenRead)) and (FileIsText(sFullPathToFile)) then
begin
Result:= CreatePreviewText(sFullPathToFile);
Exit; // No need to save in cache
FFileName:= sFullPathToFile;
// Some widgetsets can not draw from background
// thread so call draw text function from main thread
TThread.Synchronize(nil, @DoCreatePreviewText);
Exit(FBitmap); // No need to save in cache
end
// Try to create thumnail using providers
else
@ -332,4 +346,4 @@ begin
end;
end.