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: GTK2 - TPanel DefaultColor should be clBackground, not clBtnFace

Browse source
This commit is contained in:
Alexander Koblov 2017-12-12 19:28:53 +00:00
commit fdd39ab9fc
1 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/platform/unix/ugtk2fixcursorpos.pas
View file

@ -9,12 +9,19 @@ unit uGtk2FixCursorPos;
interface
uses
LCLVersion;
implementation
uses
Classes, SysUtils, Gtk2WSStdCtrls, Gtk2, Gtk2Def, Gtk2WSSpin, Gtk2Proc,
WSLCLClasses, StdCtrls, Glib2, Gtk2Globals, Spin, LMessages, LazUTF8, Gdk2,
Controls;
Controls, ExtCtrls
{$if lcl_fullversion < 1090000}
, Gtk2WSExtCtrls, Graphics
{$endif}
;
type
@ -32,6 +39,17 @@ type
class procedure SetCallbacks(const AGtkWidget: PGtkWidget; const AWidgetInfo: PWidgetInfo); override;
end;
{$if lcl_fullversion < 1090000}
{ TGtk2WSCustomPanelEx }
TGtk2WSCustomPanelEx = class(TGtk2WSCustomPanel)
published
class function GetDefaultColor(const AControl: TControl; const ADefaultColorType: TDefaultColorType): TColor; override;
end;
{$endif}
procedure gtkcuttoclip_ex(widget: PGtkWidget; {%H-}data: gPointer); cdecl;
var
Info: PWidgetInfo;
@ -159,6 +177,23 @@ begin
end;
end;
{$if lcl_fullversion < 1090000}
{ TGtk2WSCustomPanelEx }
class function TGtk2WSCustomPanelEx.GetDefaultColor(const AControl: TControl;
const ADefaultColorType: TDefaultColorType): TColor;
const
DefColors: array[TDefaultColorType] of TColor = (
{ dctBrush } clBackground,
{ dctFont } clBtnText
);
begin
Result := DefColors[ADefaultColorType];
end;
{$endif}
{ TGtk2WSCustomEditEx }
class procedure TGtk2WSCustomEditEx.SetCallbacks(const AGtkWidget: PGtkWidget;
@ -210,6 +245,11 @@ begin
// Replace TCustomFloatSpinEdit widgetset class
with TCustomFloatSpinEdit.Create(nil) do Free;
RegisterWSComponent(TCustomFloatSpinEdit, TGtk2WSCustomFloatSpinEditEx);
{$if lcl_fullversion < 1090000}
// Replace TCustomPanel widgetset class
with TCustomPanel.Create(nil) do Free;
RegisterWSComponent(TCustomPanel, TGtk2WSCustomPanelEx);
{$endif}
end;
initialization