From c3d1101c51cda3ed09b0a0ea539d12e72f91822f Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 15 Jan 2018 06:16:12 +0000
Subject: [PATCH] RxFPC:RxMDI - fix OnChangeCurrentChild on close last window,
 make property RxMDITasks.Color published

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6132 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/demos/RxMDI/project1.lps | 101 +++++++++----------
 components/rx/trunk/rxcontrols/rxmdi.pas     |   7 ++
 2 files changed, 56 insertions(+), 52 deletions(-)

diff --git a/components/rx/trunk/demos/RxMDI/project1.lps b/components/rx/trunk/demos/RxMDI/project1.lps
index 6bdc91121..99579f3f7 100644
--- a/components/rx/trunk/demos/RxMDI/project1.lps
+++ b/components/rx/trunk/demos/RxMDI/project1.lps
@@ -3,7 +3,7 @@
   <ProjectSession>
     <Version Value="11"/>
     <BuildModes Active="Default"/>
-    <Units Count="13">
+    <Units Count="14">
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -20,7 +20,7 @@
         <UnitName Value="Unit1"/>
         <IsVisibleTab Value="True"/>
         <TopLine Value="72"/>
-        <CursorPos X="70" Y="89"/>
+        <CursorPos X="35" Y="101"/>
         <UsageCount Value="25"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -71,8 +71,8 @@
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
         <UnitName Value="RxMDI"/>
         <EditorIndex Value="1"/>
-        <TopLine Value="262"/>
-        <CursorPos X="24" Y="281"/>
+        <TopLine Value="387"/>
+        <CursorPos X="3" Y="389"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit6>
@@ -119,127 +119,124 @@
         <CursorPos X="53" Y="789"/>
         <UsageCount Value="10"/>
       </Unit12>
+      <Unit13>
+        <Filename Value="../../../../lcl/extctrls.pp"/>
+        <UnitName Value="ExtCtrls"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="1046"/>
+        <CursorPos X="14" Y="1064"/>
+        <UsageCount Value="10"/>
+      </Unit13>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="27" HistoryIndex="26">
       <Position1>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="117" Column="44" TopLine="80"/>
+        <Filename Value="../../rxcontrols/rxmdi.pas"/>
+        <Caret Line="142" Column="8" TopLine="133"/>
       </Position1>
       <Position2>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="161" Column="15" TopLine="143"/>
+        <Caret Line="147" Column="20" TopLine="141"/>
       </Position2>
       <Position3>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="432" Column="3" TopLine="427"/>
+        <Caret Line="312" Column="33" TopLine="301"/>
       </Position3>
       <Position4>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="160" Column="15" TopLine="142"/>
+        <Caret Line="281" Column="24" TopLine="262"/>
       </Position4>
       <Position5>
         <Filename Value="unit1.pas"/>
-        <Caret Line="117" Column="44" TopLine="80"/>
+        <Caret Line="91" Column="58" TopLine="72"/>
       </Position5>
       <Position6>
-        <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="161" Column="15" TopLine="143"/>
+        <Filename Value="unit1.pas"/>
+        <Caret Line="89" Column="70" TopLine="72"/>
       </Position6>
       <Position7>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="439" Column="31" TopLine="408"/>
+        <Caret Line="281" Column="21" TopLine="262"/>
       </Position7>
       <Position8>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="117" Column="44" TopLine="89"/>
+        <Filename Value="../../rxcontrols/rxmdi.pas"/>
+        <Caret Line="106" Column="20" TopLine="73"/>
       </Position8>
       <Position9>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="103" Column="3" TopLine="89"/>
+        <Filename Value="../../rxcontrols/rxmdi.pas"/>
+        <Caret Line="92" Column="16" TopLine="73"/>
       </Position9>
       <Position10>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="160" Column="15" TopLine="142"/>
+        <Caret Line="599" Column="3" TopLine="595"/>
       </Position10>
       <Position11>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="415" Column="31" TopLine="410"/>
+        <Caret Line="128" Column="15" TopLine="98"/>
       </Position11>
       <Position12>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="877" TopLine="851"/>
+        <Caret Line="266" Column="3" TopLine="264"/>
       </Position12>
       <Position13>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
+        <Caret Line="175" Column="17" TopLine="138"/>
       </Position13>
       <Position14>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="283" Column="56" TopLine="252"/>
+        <Caret Line="149" Column="15" TopLine="138"/>
       </Position14>
       <Position15>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="177" Column="85" TopLine="141"/>
+        <Caret Line="319" Column="3" TopLine="317"/>
       </Position15>
       <Position16>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="302" Column="3" TopLine="299"/>
+        <Caret Line="147" Column="15" TopLine="128"/>
       </Position16>
       <Position17>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="145" Column="15" TopLine="128"/>
+        <Caret Line="300" Column="16" TopLine="295"/>
       </Position17>
       <Position18>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="108" Column="55" TopLine="89"/>
+        <Filename Value="../../rxcontrols/rxmdi.pas"/>
+        <Caret Line="66" Column="15" TopLine="47"/>
       </Position18>
       <Position19>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="110" Column="55" TopLine="91"/>
+        <Filename Value="../../rxcontrols/rxmdi.pas"/>
+        <Caret Line="826" Column="3" TopLine="824"/>
       </Position19>
       <Position20>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="118" TopLine="91"/>
+        <Filename Value="../../rxcontrols/rxmdi.pas"/>
+        <Caret Line="71" Column="15" TopLine="47"/>
       </Position20>
       <Position21>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="119" Column="12" TopLine="92"/>
+        <Filename Value="../../rxcontrols/rxmdi.pas"/>
+        <Caret Line="863" Column="3" TopLine="861"/>
       </Position21>
       <Position22>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="53" Column="15" TopLine="35"/>
+        <Filename Value="../../rxcontrols/rxmdi.pas"/>
+        <Caret Line="66" Column="17" TopLine="53"/>
       </Position22>
       <Position23>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="283" Column="5" TopLine="275"/>
+        <Caret Line="826" Column="3" TopLine="823"/>
       </Position23>
       <Position24>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="146" Column="17" TopLine="137"/>
+        <Caret Line="91" Column="15" TopLine="72"/>
       </Position24>
       <Position25>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="142" Column="8" TopLine="133"/>
+        <Caret Line="587" Column="13" TopLine="579"/>
       </Position25>
       <Position26>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="147" Column="20" TopLine="141"/>
+        <Caret Line="595" Column="46" TopLine="575"/>
       </Position26>
       <Position27>
         <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="312" Column="33" TopLine="301"/>
+        <Caret Line="154" Column="15" TopLine="135"/>
       </Position27>
-      <Position28>
-        <Filename Value="../../rxcontrols/rxmdi.pas"/>
-        <Caret Line="281" Column="24" TopLine="262"/>
-      </Position28>
-      <Position29>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="91" Column="58" TopLine="72"/>
-      </Position29>
-      <Position30>
-        <Filename Value="unit1.pas"/>
-        <Caret Line="89" Column="70" TopLine="72"/>
-      </Position30>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>
diff --git a/components/rx/trunk/rxcontrols/rxmdi.pas b/components/rx/trunk/rxcontrols/rxmdi.pas
index da03401f1..4d22749f0 100644
--- a/components/rx/trunk/rxcontrols/rxmdi.pas
+++ b/components/rx/trunk/rxcontrols/rxmdi.pas
@@ -103,6 +103,7 @@ type
   published
     property Align;
     property ShowHint;
+    property Color;
     property ParentShowHint;
     property FlatButton:boolean read GetFlatButton write SetFlatButton;
     property Options:TRxMDITaskOptions read FOptions write FOptions;
@@ -587,7 +588,13 @@ begin
       ShowWindow(CC as TForm)
   end
   else
+  begin
     FMainPanel.CurrentChildWindow:=nil;
+    if not Application.Terminated then
+      if Assigned(FMainPanel) then
+        FMainPanel.DoOnChangeCurrentChild(nil);
+
+  end;
 //  Invalidate;
 end;