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

RxFPC:fix ToolBar height after hide all buttons

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6754 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2018-12-14 10:54:15 +00:00
parent 383826d2b2
commit 43ea6368e1
10 changed files with 96 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/rx/trunk/languages/rxconst.es.po
View File

@ -262,6 +262,10 @@ msgstr ""
msgid "Second quarter"
msgstr ""
#: rxconst.sseparator
msgid "Separator"
msgstr ""
#: rxconst.sshortcut
msgid "ShortCut"
msgstr ""

5
components/rx/trunk/languages/rxconst.pl.po
View File

@ -269,6 +269,10 @@ msgstr "Druga połowa roku"
msgid "Second quarter"
msgstr "Drugi kwartał"
#: rxconst.sseparator
msgid "Separator"
msgstr ""
#: rxconst.sshortcut
msgid "ShortCut"
msgstr ""
@ -352,3 +356,4 @@ msgstr ""
#: rxconst.swindowsicofiles
msgid "Windows Ico files (*.ico)|*.ico|All files (*.*)|*.*"
msgstr ""

4
components/rx/trunk/languages/rxconst.po
View File

@ -259,6 +259,10 @@ msgstr ""
msgid "Second quarter"
msgstr ""
#: rxconst.sseparator
msgid "Separator"
msgstr ""
#: rxconst.sshortcut
msgid "ShortCut"
msgstr ""

4
components/rx/trunk/languages/rxconst.ru.po
View File

@ -269,6 +269,10 @@ msgstr "Вторая половина года"
msgid "Second quarter"
msgstr "Второй квартал"
#: rxconst.sseparator
msgid "Separator"
msgstr ""
#: rxconst.sshortcut
msgid "ShortCut"
msgstr ""

4
components/rx/trunk/languages/rxconst.uk.po
View File

@ -275,6 +275,10 @@ msgstr ""
msgid "Second quarter"
msgstr ""
#: rxconst.sseparator
msgid "Separator"
msgstr ""
#: rxconst.sshortcut
msgid "ShortCut"
msgstr ""

1
components/rx/trunk/languages/rxdconst.pl.po
View File

@ -762,3 +762,4 @@ msgstr "Użyj surowego JPEG"
#: rxdconst.susernamelabel
msgid "&User name:"
msgstr "Nazwa &użytkownika:"

86
components/rx/trunk/rxcontrols/rxtbrsetup.lfm
View File

@ -13,7 +13,7 @@ object ToolPanelSetupForm: TToolPanelSetupForm
LCLVersion = '2.1.0.0'
object PageControl1: TPageControl
Left = 0
Height = 429
Height = 433
Top = 0
Width = 657
ActivePage = TabSheet1
@ -22,16 +22,16 @@ object ToolPanelSetupForm: TToolPanelSetupForm
TabOrder = 0
object TabSheet1: TTabSheet
Caption = 'Visible buttons'
ClientHeight = 398
ClientHeight = 400
ClientWidth = 647
object Label1: TLabel
AnchorSideLeft.Control = btnLeft2
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = TabSheet1
Left = 339
Height = 17
Left = 337
Height = 19
Top = 6
Width = 105
Width = 113
BorderSpacing.Around = 6
Caption = 'Avaliable buttons'
FocusControl = ListBtnAvaliable
@ -40,9 +40,9 @@ object ToolPanelSetupForm: TToolPanelSetupForm
object Label2: TLabel
AnchorSideTop.Control = TabSheet1
Left = 8
Height = 17
Height = 19
Top = 6
Width = 90
Width = 96
BorderSpacing.Around = 6
Caption = 'Visible buttons'
FocusControl = ListBtnVisible
@ -54,10 +54,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = btnRight2
AnchorSideRight.Side = asrBottom
Left = 313
Left = 315
Height = 30
Top = 125
Width = 20
Top = 119
Width = 16
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
BorderSpacing.InnerBorder = 2
@ -70,10 +70,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = btnRight2
AnchorSideRight.Side = asrBottom
Left = 313
Height = 20
Top = 99
Width = 20
Left = 315
Height = 16
Top = 97
Width = 16
Anchors = [akTop, akLeft, akRight]
AutoSize = True
BorderSpacing.Top = 6
@ -87,10 +87,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = btnRight2
AnchorSideRight.Side = asrBottom
Left = 313
Left = 315
Height = 38
Top = 55
Width = 20
Top = 53
Width = 16
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
BorderSpacing.InnerBorder = 2
@ -101,10 +101,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideLeft.Control = TabSheet1
AnchorSideLeft.Side = asrCenter
AnchorSideTop.Control = ListBtnAvaliable
Left = 313
Height = 20
Top = 29
Width = 20
Left = 315
Height = 16
Top = 31
Width = 16
AutoSize = True
BorderSpacing.InnerBorder = 2
OnClick = btnRight2Click
@ -118,10 +118,10 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideRight.Control = TabSheet1
AnchorSideRight.Side = asrBottom
AnchorSideBottom.Control = cbShowCaption
Left = 339
Left = 337
Height = 266
Top = 29
Width = 302
Top = 31
Width = 304
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Around = 6
IntegralHeight = True
@ -138,7 +138,7 @@ object ToolPanelSetupForm: TToolPanelSetupForm
OnClick = ListBtnAvaliableClick
OnDblClick = ListBtnVisibleDblClick
OnDrawItem = ListBox1DrawItem
ScrollWidth = 300
ScrollWidth = 302
Style = lbOwnerDrawFixed
TabOrder = 4
end
@ -149,17 +149,17 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = btnRight2
AnchorSideBottom.Control = cbShowCaption
Left = 32
Left = 28
Height = 266
Top = 29
Width = 275
Top = 31
Width = 281
Anchors = [akTop, akLeft, akRight, akBottom]
BorderSpacing.Around = 6
ItemHeight = 0
OnClick = ListBtnAvaliableClick
OnDblClick = ListBtnVisibleDblClick
OnDrawItem = ListBox1DrawItem
ScrollWidth = 273
ScrollWidth = 279
Style = lbOwnerDrawFixed
TabOrder = 5
TopIndex = -1
@ -169,7 +169,7 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideBottom.Side = asrBottom
Left = 3
Height = 62
Top = 330
Top = 332
Width = 635
Alignment = taLeftJustify
Anchors = [akLeft, akRight, akBottom]
@ -183,8 +183,8 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideBottom.Control = Panel1
Left = 6
Height = 23
Top = 301
Width = 108
Top = 303
Width = 114
Anchors = [akLeft, akBottom]
BorderSpacing.Around = 6
Caption = 'Show caption'
@ -199,9 +199,9 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideRight.Control = btnRight2
AnchorSideRight.Side = asrBottom
Left = 6
Height = 20
Top = 29
Width = 20
Height = 16
Top = 31
Width = 16
AutoSize = True
BorderSpacing.Around = 6
BorderSpacing.InnerBorder = 2
@ -216,9 +216,9 @@ object ToolPanelSetupForm: TToolPanelSetupForm
AnchorSideRight.Control = btnRight2
AnchorSideRight.Side = asrBottom
Left = 6
Height = 20
Top = 55
Width = 20
Height = 16
Top = 53
Width = 16
AutoSize = True
BorderSpacing.Around = 6
BorderSpacing.InnerBorder = 2
@ -228,7 +228,7 @@ object ToolPanelSetupForm: TToolPanelSetupForm
end
object TabSheet2: TTabSheet
Caption = 'Options'
ClientHeight = 398
ClientHeight = 400
ClientWidth = 647
object cbShowHint: TCheckBox
AnchorSideLeft.Control = TabSheet2
@ -287,7 +287,7 @@ object ToolPanelSetupForm: TToolPanelSetupForm
ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1
ClientHeight = 81
ClientHeight = 79
ClientWidth = 308
Items.Strings = (
'None'
@ -318,7 +318,7 @@ object ToolPanelSetupForm: TToolPanelSetupForm
ChildSizing.ShrinkVertical = crsScaleChilds
ChildSizing.Layout = cclLeftToRightThenTopToBottom
ChildSizing.ControlsPerLine = 1
ClientHeight = 81
ClientHeight = 79
ClientWidth = 308
Items.Strings = (
'Standart'
@ -346,8 +346,8 @@ object ToolPanelSetupForm: TToolPanelSetupForm
end
object ButtonPanel1: TButtonPanel
Left = 6
Height = 46
Top = 435
Height = 42
Top = 439
Width = 645
OKButton.Name = 'OKButton'
OKButton.DefaultCaption = True

17
components/rx/trunk/rxcontrols/rxtbrsetup.pas
View File

@ -123,16 +123,15 @@ begin
Cnv.FillRect(ARect); { clear the rectangle }
P:=TToolbarItem((Control as TListBox).Items.Objects[Index]);
SText:=(Control as TListBox).Items[Index];
if Assigned(P) then
begin
Offset := 2;
if Assigned(FToolPanel.ImageList) and Assigned(P.Action) then
begin
if (P.Action is TCustomAction) and
(TCustomAction(P.Action).ImageIndex>-1) and
(TCustomAction(P.Action).ImageIndex < FToolPanel.ImageList.Count) then
begin
Offset := 2;
BtnRect.Top:=ARect.Top + 2;
BtnRect.Left:=ARect.Left + Offset;
BtnRect.Right:=BtnRect.Left + FToolPanel.DefImgWidth * 2;
@ -141,15 +140,27 @@ begin
Cnv.FillRect(BtnRect);
DrawButtonFrame(Cnv, BtnRect, false, false);
FToolPanel.ImageList.Draw(Cnv, BtnRect.Left + FToolPanel.DefImgWidth div 2,
BtnRect.Top + FToolPanel.DefImgHeight div 2,
BtnRect.Top + ((BtnRect.Bottom - BtnRect.Top - FToolPanel.DefImgHeight) div 2),
TCustomAction(P.Action).ImageIndex, True);
Offset:=BtnRect.Right;
end;
end;
if P.ButtonStyle in [tbrSeparator, tbrDivider] then
SText:=sSeparator
else
if Assigned(P.Action) and (P.Action is TCustomAction) then
SText:=TCustomAction(P.Action).Caption
else
SText:=(Control as TListBox).Items[Index];
Offset := Offset + 6;
Cnv.Brush.Color:=C;
Cnv.TextOut(ARect.Left + Offset, (ARect.Top + ARect.Bottom - TW) div 2, SText); { display the text }
if (P.Action is TAction) then
if TAction(P.Action).ShortCut <> 0 then
begin

17
components/rx/trunk/rxcontrols/rxtoolbar.pas
View File

@ -235,6 +235,7 @@ type
procedure Loaded; override;
procedure CalculatePreferredSize( var PreferredWidth, PreferredHeight: integer; WithThemeSpace: Boolean); override;
function DoAlignChildControls(TheAlign: TAlign; AControl: TControl; AControlList: TFPList; var ARect: TRect): Boolean; override;
procedure GetPreferredSize(var PreferredWidth, PreferredHeight: integer; Raw: boolean = false; WithThemeSpace: boolean = true); override;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
@ -1173,6 +1174,11 @@ begin
FDefImgWidth:=FImageList.Width;
FDefImgHeight:=FImageList.Height;
{$ENDIF}
end
else
begin
FDefImgWidth:=FInternalDefButtonWidth;
FDefImgHeight:=FInternalDefButtonHeight;
end;
end;
@ -1185,8 +1191,8 @@ var
OldFont: HGDIOBJ;
S: TTranslateString;
begin
MaxHeight:=0;
InternalCalcImgSize;
MaxHeight:=FDefImgHeight;
DC := GetDC(Handle);
try
OldFont := SelectObject(DC, HGDIOBJ(Font.Reference.Handle));
@ -1325,6 +1331,14 @@ begin
Result:=inherited DoAlignChildControls(TheAlign, AControl, AControlList, ARect);
end;
procedure TToolPanel.GetPreferredSize(var PreferredWidth,
PreferredHeight: integer; Raw: boolean; WithThemeSpace: boolean);
begin
inherited GetPreferredSize(PreferredWidth, PreferredHeight, Raw, WithThemeSpace);
if PreferredHeight < FInternalDefButtonHeight then
PreferredHeight:=FInternalDefButtonHeight;
end;
constructor TToolPanel.Create(AOwner: TComponent);
begin
inherited Create(AOwner);
@ -1389,6 +1403,7 @@ begin
else
aHeight:=FInternalDefButtonHeight + BorderWidth * 2;
end;
inherited SetBounds(aLeft, aTop, aWidth, aHeight);
end;

1
components/rx/trunk/rxtools/rxconst.pas
View File

@ -88,6 +88,7 @@ resourcestring
sGeneral = 'General';
sLicense = 'License';
SOutOfRange = 'Out of range %d %d %d %d';
sSeparator = 'Separator';
{ TRxHistoryNavigator }
sHistoryDesc = 'History - "%s"';