pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxFPC:fix TRxMDICloseButton.ShowInfoLabel

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6134 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2018-01-15 12:38:32 +00:00
parent 5b33f95e6e
commit 66045e97c0
4 changed files with 52 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
components/rx/trunk/demos/RxMDI/project1.lps
View File

@ -18,9 +18,8 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="Unit1"/> <UnitName Value="Unit1"/>
<IsVisibleTab Value="True"/> <TopLine Value="108"/>
<TopLine Value="72"/> <CursorPos X="10" Y="126"/>
<CursorPos X="35" Y="101"/>
<UsageCount Value="25"/> <UsageCount Value="25"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -70,9 +69,10 @@
<Unit6> <Unit6>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<UnitName Value="RxMDI"/> <UnitName Value="RxMDI"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<TopLine Value="387"/> <TopLine Value="191"/>
<CursorPos X="3" Y="389"/> <CursorPos X="52" Y="215"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit6> </Unit6>
@ -128,115 +128,127 @@
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit13> </Unit13>
</Units> </Units>
<JumpHistory Count="27" HistoryIndex="26"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="142" Column="8" TopLine="133"/> <Caret Line="147" Column="15" TopLine="128"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="147" Column="20" TopLine="141"/> <Caret Line="300" Column="16" TopLine="295"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="312" Column="33" TopLine="301"/> <Caret Line="66" Column="15" TopLine="47"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="281" Column="24" TopLine="262"/> <Caret Line="826" Column="3" TopLine="824"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="unit1.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="91" Column="58" TopLine="72"/> <Caret Line="71" Column="15" TopLine="47"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="unit1.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="89" Column="70" TopLine="72"/> <Caret Line="863" Column="3" TopLine="861"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="281" Column="21" TopLine="262"/> <Caret Line="66" Column="17" TopLine="53"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="106" Column="20" TopLine="73"/> <Caret Line="826" Column="3" TopLine="823"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="92" Column="16" TopLine="73"/> <Caret Line="91" Column="15" TopLine="72"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="599" Column="3" TopLine="595"/> <Caret Line="587" Column="13" TopLine="579"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="128" Column="15" TopLine="98"/> <Caret Line="595" Column="46" TopLine="575"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="266" Column="3" TopLine="264"/> <Caret Line="154" Column="15" TopLine="135"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="unit1.pas"/>
<Caret Line="175" Column="17" TopLine="138"/> <Caret Line="125" Column="13" TopLine="105"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="unit1.pas"/>
<Caret Line="149" Column="15" TopLine="138"/> <Caret Line="45" Column="15" TopLine="29"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="319" Column="3" TopLine="317"/> <Caret Line="389" Column="3" TopLine="387"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="147" Column="15" TopLine="128"/> <Caret Line="98" Column="15" TopLine="79"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="300" Column="16" TopLine="295"/> <Caret Line="136" TopLine="100"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="66" Column="15" TopLine="47"/> <Caret Line="120" Column="15" TopLine="100"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="826" Column="3" TopLine="824"/> <Caret Line="190" TopLine="183"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="71" Column="15" TopLine="47"/> <Caret Line="191" TopLine="183"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="863" Column="3" TopLine="861"/> <Caret Line="192" TopLine="183"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="66" Column="17" TopLine="53"/> <Caret Line="215" Column="52" TopLine="189"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="826" Column="3" TopLine="823"/> <Caret Line="190" TopLine="183"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="91" Column="15" TopLine="72"/> <Caret Line="210" TopLine="183"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="587" Column="13" TopLine="579"/> <Caret Line="211" TopLine="183"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="595" Column="46" TopLine="575"/> <Caret Line="212" TopLine="183"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="../../rxcontrols/rxmdi.pas"/> <Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="154" Column="15" TopLine="135"/> <Caret Line="214" TopLine="183"/>
</Position27> </Position27>
<Position28>
<Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="215" TopLine="184"/>
</Position28>
<Position29>
<Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="229" TopLine="211"/>
</Position29>
<Position30>
<Filename Value="../../rxcontrols/rxmdi.pas"/>
<Caret Line="190" TopLine="171"/>
</Position30>
</JumpHistory> </JumpHistory>
<RunParams> <RunParams>
<FormatVersion Value="2"/> <FormatVersion Value="2"/>

1
components/rx/trunk/demos/RxMDI/unit1.lfm
View File

@ -53,6 +53,7 @@ object Form1: TForm1
0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000000000000000
} }
ShowInfoLabel = False
end end
end end
object RxMDITasks1: TRxMDITasks object RxMDITasks1: TRxMDITasks

2
components/rx/trunk/demos/RxMDI/unit1.pas
View File

@ -111,7 +111,7 @@ end;
procedure TForm1.FormCreate(Sender: TObject); procedure TForm1.FormCreate(Sender: TObject);
begin begin
UpdateOptions; //UpdateOptions;
end; end;
procedure TForm1.optHideCloseButtonExecute(Sender: TObject); procedure TForm1.optHideCloseButtonExecute(Sender: TObject);

2
components/rx/trunk/rxcontrols/rxmdi.pas
View File

@ -212,7 +212,7 @@ begin
Parent.DisableAlign; Parent.DisableAlign;
//DebugLn(['TCustomLabeledEdit.DoPositionLabel ']); //DebugLn(['TCustomLabeledEdit.DoPositionLabel ']);
FInfoLabel.Parent := Parent; FInfoLabel.Parent := Parent;
FInfoLabel.Visible := Visible; FInfoLabel.Visible := Visible and FShowInfoLabel;
{ case FLabelPosition of { case FLabelPosition of
lpAbove: lpAbove:
begin begin