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

Merged revision(s) 55220 #d3f428a7d5, 55249 #dd9bed2d96 from trunk:

Browse Source 
IDE: ObjectInspector: Fixed OI don't show "default" in list of font names. Issue #31958
........
IDE: Fixed TControl.InvalidatePreferredSize loop detected. Issue #30617
........

git-svn-id: branches/fixes_1_8@55254 -
This commit is contained in:
maxim 2017-06-05 22:43:19 +00:00
parent 02956076e4
commit 417085fa70
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/ideintf/graphpropedits.pas
View File

@ -443,6 +443,7 @@ procedure TFontNamePropertyEditor.GetValues(Proc: TGetStrProc);
var var
I: Integer; I: Integer;
begin begin
Proc('default');
for I := 0 to Screen.Fonts.Count -1 do for I := 0 to Screen.Fonts.Count -1 do
Proc(Screen.Fonts[I]); Proc(Screen.Fonts[I]);
end; end;

2
lcl/include/scrollingwincontrol.inc
View File

@ -213,7 +213,7 @@ end;
procedure TScrollingWinControl.UpdateScrollbars; procedure TScrollingWinControl.UpdateScrollbars;
begin begin
if ([csLoading, csDestroying] * ComponentState <> []) then Exit; if ([csLoading, csDestroying, csDesigning] * ComponentState <> []) then Exit;
if not HandleAllocated then Exit; if not HandleAllocated then Exit;
if (HorzScrollBar = nil) or (VertScrollBar = nil) then Exit; if (HorzScrollBar = nil) or (VertScrollBar = nil) then Exit;