From 7e03ffb4f854fb65ba290fc060e459fc05fbd15f Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 30 Mar 2025 22:12:54 +0000
Subject: [PATCH] LazMapViewer: cosmetics

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9711 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../addons/bgra_drawingengine/mvde_bgra.pas   | 25 +++++++------
 .../mvde_rgbgraphics.pas                      | 35 ++++++++++---------
 .../lazmapviewer/source/mvde_intfgraphics.pas | 20 +++++------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas b/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas
index bd46bc3c0..ebf0b20f2 100644
--- a/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas
+++ b/components/lazmapviewer/source/addons/bgra_drawingengine/mvde_bgra.pas
@@ -122,16 +122,6 @@ end;
 
 { TBGRABitmapCacheItem }
 
-function TBGRABitmapCacheItem.GetImageObject: TObject;
-begin
-  Result := FImage;
-end;
-
-function TBGRABitmapCacheItem.GetImage: TBGRABitmap;
-begin
-  Result := FImage;
-end;
-
 constructor TBGRABitmapCacheItem.Create(AStream: TStream);
 var
   Reader: TFPCustomImageReader;
@@ -154,6 +144,16 @@ begin
   end;
 end;
 
+function TBGRABitmapCacheItem.GetImageObject: TObject;
+begin
+  Result := FImage;
+end;
+
+function TBGRABitmapCacheItem.GetImage: TBGRABitmap;
+begin
+  Result := FImage;
+end;
+
 { Scales the image to the new size if the original size is different.
   This is needed to have all tiles at the same size. }
 procedure TBGRABitmapCacheItem.StretchImageIfNeeded(var AImage: TBGRABitmap;
@@ -485,9 +485,8 @@ begin
       dy := R.Height/2;
       ctr := PointF(X + dx, Y + dy);
       FBuffer.CanvasBGRA.PolygonF([Pts[0] + ctr, Pts[1] + ctr, Pts[2] + ctr, Pts[3] + ctr], False, True);
-      FBuffer.FontVerticalAnchor := fvaCapLine; //fvaCenter;
-//      FBuffer.TextOut(ctr.X, ctr.Y, AText, FontColor, taCenter);
-      FBuffer.TextOut(ctr.x + Pts[0].X, ctr.Y + Pts[0].Y, AText, FontColor);
+      FBuffer.FontVerticalAnchor := fvaCapLine;
+      FBuffer.TextOut(ctr.X + Pts[0].X, ctr.Y + Pts[0].Y, AText, FontColor);
     end;
   end;
 end;
diff --git a/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas b/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas
index b7081fec3..c74958e79 100644
--- a/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas
+++ b/components/lazmapviewer/source/addons/rgbgraphics_drawingengine/mvde_rgbgraphics.pas
@@ -260,16 +260,6 @@ end;
 
 { TRGB32BitmapCacheItem }
 
-function TRGB32BitmapCacheItem.GetImage: TRGB32Bitmap;
-begin
-  Result := FImage;
-end;
-
-function TRGB32BitmapCacheItem.GetImageObject: TObject;
-begin
-  Result := FImage;
-end;
-
 constructor TRGB32BitmapCacheItem.Create(AStream: TStream);
 var
   Reader: TFPCustomImageReader;
@@ -298,6 +288,16 @@ begin
   inherited Destroy;
 end;
 
+function TRGB32BitmapCacheItem.GetImage: TRGB32Bitmap;
+begin
+  Result := FImage;
+end;
+
+function TRGB32BitmapCacheItem.GetImageObject: TObject;
+begin
+  Result := FImage;
+end;
+
 { Scales the image to the new size if the original size is different.
   This is needed to have all tiles at the same size. }
 procedure TRGB32BitmapCacheItem.StretchImageIfNeeded(var AImage: TRGB32Bitmap;
@@ -308,6 +308,15 @@ begin
       AImage.StretchTrunc(ANewWidth, ANewHeight);
 end;
 
+
+{ TMvRGBGraphicsDrawingEngine }
+
+constructor TMvRGBGraphicsDrawingEngine.Create(AOwner: TComponent);
+begin
+  inherited Create(AOwner);
+  Opacity := 1.0;
+end;
+
 destructor TMvRGBGraphicsDrawingEngine.Destroy;
 begin
   FBuffer.Free;
@@ -704,12 +713,6 @@ begin
     FBuffer.Canvas.DrawMode := dmOutline;
 end;
 
-constructor TMvRGBGraphicsDrawingEngine.Create(AOwner: TComponent);
-begin
-  inherited Create(AOwner);
-  Opacity := 1.0;
-end;
-
 function TMvRGBGraphicsDrawingEngine.TextExtent(const AText: String;
   ARotated: Boolean = false): TSize;
 var
diff --git a/components/lazmapviewer/source/mvde_intfgraphics.pas b/components/lazmapviewer/source/mvde_intfgraphics.pas
index ac28a5545..4caa974d5 100644
--- a/components/lazmapviewer/source/mvde_intfgraphics.pas
+++ b/components/lazmapviewer/source/mvde_intfgraphics.pas
@@ -178,16 +178,6 @@ end;
 
 { TLazIntfImageCacheItem }
 
-function TLazIntfImageCacheItem.GetImage: TLazIntfImage;
-begin
-  Result := FImage;
-end;
-
-function TLazIntfImageCacheItem.GetImageObject: TObject;
-begin
-  Result := FImage;
-end;
-
 constructor TLazIntfImageCacheItem.Create(AStream: TStream);
 var
   reader: TFPCustomImageReader;
@@ -219,6 +209,16 @@ begin
   inherited Destroy;
 end;
 
+function TLazIntfImageCacheItem.GetImage: TLazIntfImage;
+begin
+  Result := FImage;
+end;
+
+function TLazIntfImageCacheItem.GetImageObject: TObject;
+begin
+  Result := FImage;
+end;
+
 { Scales the image to the new size if the original size is different.
   This is needed to have all tiles at the same size. }
 procedure TLazIntfImageCacheItem.StretchImageIfNeeded(var AImage: TLazIntfImage;