From ca80c68d6b96e27b38f8b4b59d79d91c0e0fb394 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 17 Dec 2018 07:52:47 +0000
Subject: [PATCH] RxFPC:fix rxtoolbar config dialog

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6759 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/rxcontrols/rxtbrsetup.pas | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/components/rx/trunk/rxcontrols/rxtbrsetup.pas b/components/rx/trunk/rxcontrols/rxtbrsetup.pas
index c39133eed..54224bb8b 100644
--- a/components/rx/trunk/rxcontrols/rxtbrsetup.pas
+++ b/components/rx/trunk/rxcontrols/rxtbrsetup.pas
@@ -82,6 +82,7 @@ type
   private
     procedure FillItems(List:TStrings; AVisible:boolean);
     procedure UpdateStates;
+    procedure UpdateButtonIndex;
     procedure Localize;
   public
     FToolPanel:TToolPanel;
@@ -254,6 +255,20 @@ begin
     cbShowCaption.Enabled:=false;
 end;
 
+procedure TToolPanelSetupForm.UpdateButtonIndex;
+var
+  P: TToolbarItem;
+  i: Integer;
+begin
+  FToolPanel.DisableAlign;
+  for i:=0 to ListBtnVisible.Items.Count-1 do
+  begin
+    P:=TToolbarItem(ListBtnVisible.Items.Objects[i]);
+    P.Index:=i;
+  end;
+  FToolPanel.EnableAlign;
+end;
+
 procedure TToolPanelSetupForm.Localize;
 begin
   Caption:=sToolPanelSetup;
@@ -311,29 +326,29 @@ end;
 procedure TToolPanelSetupForm.btnLeftClick(Sender: TObject);
 begin
   BoxMoveSelectedItems(ListBtnAvaliable, ListBtnVisible);
+  UpdateButtonIndex;
   UpdateStates;
-  FToolPanel.ReAlign;
 end;
 
 procedure TToolPanelSetupForm.btnLeft2Click(Sender: TObject);
 begin
   BoxMoveAllItems(ListBtnAvaliable, ListBtnVisible);
+  UpdateButtonIndex;
   UpdateStates;
-  FToolPanel.ReAlign;
 end;
 
 procedure TToolPanelSetupForm.btnRightClick(Sender: TObject);
 begin
   BoxMoveSelectedItems(ListBtnVisible, ListBtnAvaliable);
+  UpdateButtonIndex;
   UpdateStates;
-  FToolPanel.ReAlign;
 end;
 
 procedure TToolPanelSetupForm.btnRight2Click(Sender: TObject);
 begin
   BoxMoveAllItems(ListBtnVisible, ListBtnAvaliable);
+  UpdateButtonIndex;
   UpdateStates;
-  FToolPanel.ReAlign;
 end;
 
 procedure TToolPanelSetupForm.btnUpClick(Sender: TObject);
@@ -352,7 +367,6 @@ begin
 
   UpdateStates;
   FToolPanel.ReAlign;
-  FToolPanel.ReAlign;
 end;
 
 constructor TToolPanelSetupForm.CreateSetupForm(AToolPanel: TToolPanel);