From 417085fa707b385a1b072dbbf59eab4d90b8bef3 Mon Sep 17 00:00:00 2001 From: maxim Date: Mon, 5 Jun 2017 22:43:19 +0000 Subject: [PATCH] Merged revision(s) 55220 #d3f428a7d5, 55249 #dd9bed2d96 from trunk: 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 - --- components/ideintf/graphpropedits.pas | 1 + lcl/include/scrollingwincontrol.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/ideintf/graphpropedits.pas b/components/ideintf/graphpropedits.pas index 1fb821a517..54a7d0fd63 100644 --- a/components/ideintf/graphpropedits.pas +++ b/components/ideintf/graphpropedits.pas @@ -443,6 +443,7 @@ procedure TFontNamePropertyEditor.GetValues(Proc: TGetStrProc); var I: Integer; begin + Proc('default'); for I := 0 to Screen.Fonts.Count -1 do Proc(Screen.Fonts[I]); end; diff --git a/lcl/include/scrollingwincontrol.inc b/lcl/include/scrollingwincontrol.inc index 47deefe5d0..8944fec2d2 100644 --- a/lcl/include/scrollingwincontrol.inc +++ b/lcl/include/scrollingwincontrol.inc @@ -213,7 +213,7 @@ end; procedure TScrollingWinControl.UpdateScrollbars; begin - if ([csLoading, csDestroying] * ComponentState <> []) then Exit; + if ([csLoading, csDestroying, csDesigning] * ComponentState <> []) then Exit; if not HandleAllocated then Exit; if (HorzScrollBar = nil) or (VertScrollBar = nil) then Exit;