From 67593511e2a5071a219030344f71408e6cb5ec99 Mon Sep 17 00:00:00 2001
From: maxim <maxim@lazarus-ide.org>
Date: Thu, 16 Aug 2018 22:27:13 +0000
Subject: [PATCH] Merged revision(s) 58221 #39d1a5d7b4, 58521 #82ab3151e0 from
 trunk: IDE, options: Improve/Correct sizing of color palette (e.g. in used
 defined markup). Issue #0033435 ........ IDE: Update component tree(OI) when
 changing the Z-order of a control. Issue #33954. ........

git-svn-id: branches/fixes_1_8@58725 -
---
 components/ideintf/objectinspector.pp | 2 ++
 designer/designer.pp                  | 4 ++++
 ide/syncolorattribeditor.pas          | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/components/ideintf/objectinspector.pp b/components/ideintf/objectinspector.pp
index 768835fbfb..1246f8eecb 100644
--- a/components/ideintf/objectinspector.pp
+++ b/components/ideintf/objectinspector.pp
@@ -5903,6 +5903,8 @@ begin
   end;
 
   DoModified;
+  if Assigned(ComponentTree) then
+    ComponentTree.RebuildComponentNodes
 end;
 
 function TObjectInspectorDlg.GetComponentPanelHeight: integer;
diff --git a/designer/designer.pp b/designer/designer.pp
index e3201ebd9b..056c7cb288 100644
--- a/designer/designer.pp
+++ b/designer/designer.pp
@@ -1562,6 +1562,7 @@ procedure TDesigner.DoChangeZOrder(TheAction: Integer);
 var
   Control: TControl;
   Parent: TWinControl;
+  OI: TObjectInspectorDlg;
 begin
   if Selection.Count <> 1 then Exit;
   if not Selection[0].IsTControl then Exit;
@@ -1588,6 +1589,9 @@ begin
   SelectOnlyThisComponent(Control);
 
   Modified;
+  OI := FormEditingHook.GetCurrentObjectInspector;
+  if Assigned(OI) then
+    OI.ComponentTree.RebuildComponentNodes;
 end;
 
 procedure TDesigner.GiveComponentsNames;
diff --git a/ide/syncolorattribeditor.pas b/ide/syncolorattribeditor.pas
index 0cde1ac509..3048912cfa 100644
--- a/ide/syncolorattribeditor.pas
+++ b/ide/syncolorattribeditor.pas
@@ -401,6 +401,8 @@ begin
   CheckControl(FrameColorUseDefaultCheckBox);
 
   ColumnPosBevel.AnchorSide[akLeft].Control := MinAnchor;
+  Constraints.MinHeight := pnlItalic.Top + pnlItalic.Height;
+  Constraints.MinWidth := BackPriorSpin.Left + BackPriorSpin.Width;
 end;
 
 procedure TSynColorAttrEditor.TextStyleRadioOnChange(Sender: TObject);