Changeset 570 for trunk

Timestamp:

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

Author:

chronos

Message:

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

Location:

trunk

Files:

• Inp.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (3 diffs)
• Packages/DpiControls/Dpi.Controls.pas (modified) (2 diffs)
• Settings.pas (modified) (1 diff)

trunk/Inp.pas

@@ -90 +90 @@
   if Center then
     CenterToRect(Rect(0, 0, Screen.Width, Screen.Height));
+  Gtk2DisableControlStyling(EditInput);
 end;
 

trunk/LocalPlayer/MessgEx.pas

@@ -187 +187 @@
   if Kind = mkModel then
     EInput.Top := Height - (76 + Border);
+  Gtk2DisableControlStyling(EInput);
 end;
 

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

trunk/Settings.pas

@@ -264 +264 @@
   {$ENDIF}
   UpdateInterface;
+  Gtk2DisableControlStyling(EditShortCutPrimary);
+  Gtk2DisableControlStyling(EditShortCutSecondary);
 end;