Changeset 76 for trunk/UMenu.pas

Timestamp:

May 18, 2021, 10:25:20 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Colors inversion of used images if dark mode active.
• Fixed: Back button arrow drawn as image instead of font. Left arrow was not supported under Ubuntu.
• Modified: Allow to start new track from already connected station.

File:

• trunk/UMenu.pas (modified) (6 diffs)

trunk/UMenu.pas

@@ -25 +25 @@
     procedure Paint(Canvas: TCanvas; P: TPoint); virtual;
     function GetOutputText: string; virtual;
-    constructor Create;
+    constructor Create; virtual;
   end;
 
@@ -47 +47 @@
     Index: Integer;
     States: TStringList;
-    constructor Create;
+    constructor Create; override;
     destructor Destroy; override;
     procedure Paint(Canvas: TCanvas; P: TPoint); override;
@@ -62 +62 @@
     procedure Paint(Canvas: TCanvas; P: TPoint); override;
     property OnClick: TNotifyEvent read FOnClick write FOnClick;
+  end;
+
+  { TMenuItemImage }
+
+  TMenuItemImage = class(TMenuItem)
+  private
+    FOnClick: TNotifyEvent;
+  public
+    Bitmap: TBitmap;
+    procedure Paint(Canvas: TCanvas; P: TPoint); override;
+    property OnClick: TNotifyEvent read FOnClick write FOnClick;
+    constructor Create; override;
+    destructor Destroy; override;
   end;
 
@@ -105 +118 @@
 implementation
 
+{ TMenuItemImage }
+
+procedure TMenuItemImage.Paint(Canvas: TCanvas; P: TPoint);
+begin
+  if Selected then Canvas.Brush.Color := BackgroundSelectedColor
+    else Canvas.Brush.Color := BackgroundColor;
+  if Canvas.Brush.Color = clNone then Canvas.Brush.Style := bsClear
+    else Canvas.Brush.Style := bsSolid;
+  Canvas.StretchDraw(Bounds, Bitmap);
+end;
+
+constructor TMenuItemImage.Create;
+begin
+  inherited;
+  Bitmap := TBitmap.Create;
+end;
+
+destructor TMenuItemImage.Destroy;
+begin
+  FreeAndNil(Bitmap);
+  inherited;
+end;
+
 { TMenuItemButton }
 
@@ -155 +191 @@
 constructor TMenuItemComboBox.Create;
 begin
+  inherited;
   States := TStringList.Create;
 end;
@@ -160 +197 @@
 destructor TMenuItemComboBox.Destroy;
 begin
-  States.Free;
+  FreeAndNil(States);
   inherited;
 end;