Changeset 570 for trunk/Packages

Timestamp:

May 13, 2024, 7:00:49 PM (18 months ago)

Author:

chronos

Message:

• Fixed: Workaround for incorrectly styling TEdit controls under Gtk2.

Location:

trunk/Packages

Files:

• CevoComponents/ScreenTools.pas (modified) (3 diffs)
• DpiControls/Dpi.Controls.pas (modified) (2 diffs)

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -109 +109 @@
 procedure UnshareBitmap(Bitmap: TBitmap);
 procedure Gtk2Fix;
+procedure Gtk2DisableControlStyling(WinControl: TWinControl);
 procedure LoadConfig(Key: string);
 procedure SaveConfig(Key: string);
@@ -214 +215 @@
 uses
   {$IFDEF DPI}Dpi.PixelPointer,{$ELSE}PixelPointer,{$ENDIF}
-  Directories, Sound, Registry;
+  Directories, Sound, Registry
+  {$IFDEF LCLGTK2}, gtk2, WSProc{$ENDIF};
 
 var
@@ -1770 +1772 @@
 end;
 
+procedure Gtk2DisableControlStyling(WinControl: TWinControl);
+begin
+  // https://gitlab.com/freepascal.org/lazarus/lazarus/-/issues/38516
+  {$IFDEF LCLGTK2}
+  // parse gtkrc from string
+  gtk_rc_parse_string(PChar('style "noengine" {' + LineEnding +
+    'engine "" {}' + LineEnding +
+    '}' + LineEnding +
+    'widget "*.your-edit" style "noengine"'));
+
+  if WinControl.HandleAllocated then begin
+    // set gtk name to our component
+    gtk_widget_set_name({%H-}PGtkWidget(WinControl.Handle), 'your-edit');
+  end;
+  {$ENDIF}
+end;
+
 procedure LoadConfig(Key: string);
 var

trunk/Packages/DpiControls/Dpi.Controls.pas

@@ -244 +244 @@
   public
     Controls: TDpiControls;
+    function HandleAllocated: Boolean;
     procedure ScreenChanged; override;
     function ControlCount: Integer;
@@ -536 +537 @@
 end;
 
+function TWinControl.HandleAllocated: Boolean;
+begin
+  Result := GetNativeWinControl.HandleAllocated;
+end;
+
 procedure TWinControl.ScreenChanged;
 var