paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 16:29:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gtk2: fixed font changing on readonly combobox, issue #18206

Browse Source 
git-svn-id: trunk@28704 -
This commit is contained in:
zeljko 2010-12-13 15:02:40 +00:00
parent f2083e28d4
commit 2d8d01da6c
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lcl/interfaces/gtk2/gtk2wsstdctrls.pp
View File

@ -138,6 +138,8 @@ type
class procedure SetFont(const AWinControl: TWinControl; const AFont: TFont); override;
class procedure SetText(const AWinControl: TWinControl; const AText: String); override;
class procedure ShowHide(const AWinControl: TWinControl); override;
class function CanFocus(const AWinControl: TWinControl): boolean; override;
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
@ -1826,6 +1828,7 @@ class procedure TGtk2WSCustomComboBox.SetFont(const AWinControl: TWinControl;
var
Entry: PGtkEntry;
WidgetInfo: PWidgetInfo;
W: PGtkWidget;
begin
if not AWinControl.HandleAllocated then exit;
@ -1837,6 +1840,15 @@ begin
Gtk2WidgetSet.SetWidgetColor(PGtkWidget(Entry), AFont.Color, clNone,
[GTK_STATE_NORMAL,GTK_STATE_ACTIVE,GTK_STATE_PRELIGHT,GTK_STATE_SELECTED,GTK_STYLE_TEXT]);
Gtk2WidgetSet.SetWidgetFont(PGtkWidget(Entry), AFont);
end else
begin
W := GTK_BIN(WidgetInfo^.CoreWidget)^.child;
if W <> nil then
begin
Gtk2WidgetSet.SetWidgetColor(W, AFont.Color, clNone,
[GTK_STATE_NORMAL,GTK_STATE_ACTIVE,GTK_STATE_PRELIGHT,GTK_STATE_SELECTED,GTK_STYLE_TEXT]);
Gtk2WidgetSet.SetWidgetFont(W, AFont);
end;
end;
end;
@ -1865,6 +1877,16 @@ begin
Dec(WidgetInfo^.ChangeLock);
end;
class procedure TGtk2WSCustomComboBox.ShowHide(const AWinControl: TWinControl);
begin
// gtk2 doesn't set font on readonly combobox properly
// so we are doing it one more time before showing.
if AWinControl.HandleObjectShouldBeVisible and
TCustomComboBox(AWinControl).ReadOnly then
SetFont(AWinControl, AWinControl.Font);
inherited ShowHide(AWinControl);
end;
class function TGtk2WSCustomComboBox.CanFocus(const AWinControl: TWinControl
): boolean;
var