|
@@ -745,6 +745,9 @@ begin
|
|
|
r := GetButtonRect;
|
|
r := GetButtonRect;
|
|
|
RenderState(ABGRA, AState, r, FRounding);
|
|
RenderState(ABGRA, AState, r, FRounding);
|
|
|
|
|
|
|
|
|
|
+ if not GlyphOldPlacement then
|
|
|
|
|
+ r.Inflate(-round(InnerMargin),-round(InnerMargin));
|
|
|
|
|
+
|
|
|
{ Calculating rect }
|
|
{ Calculating rect }
|
|
|
CalculateBorderRect(AState.Border, r);
|
|
CalculateBorderRect(AState.Border, r);
|
|
|
|
|
|
|
@@ -1024,6 +1027,7 @@ begin
|
|
|
Exit;
|
|
Exit;
|
|
|
FImages := AValue;
|
|
FImages := AValue;
|
|
|
RenderControl;
|
|
RenderControl;
|
|
|
|
|
+ UpdateSize;
|
|
|
Invalidate;
|
|
Invalidate;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
@@ -1032,6 +1036,7 @@ begin
|
|
|
if FInnerMargin=AValue then Exit;
|
|
if FInnerMargin=AValue then Exit;
|
|
|
FInnerMargin:=AValue;
|
|
FInnerMargin:=AValue;
|
|
|
RenderControl;
|
|
RenderControl;
|
|
|
|
|
+ UpdateSize;
|
|
|
Invalidate;
|
|
Invalidate;
|
|
|
end;
|
|
end;
|
|
|
|
|
|
|
@@ -1163,8 +1168,8 @@ begin
|
|
|
end else
|
|
end else
|
|
|
begin
|
|
begin
|
|
|
if ShowCaption then actualCaption := Caption else actualCaption := '';
|
|
if ShowCaption then actualCaption := Caption else actualCaption := '';
|
|
|
- PreferredWidth := 0;
|
|
|
|
|
- PreferredHeight := 0;
|
|
|
|
|
|
|
+ PreferredWidth := round(InnerMargin);
|
|
|
|
|
+ PreferredHeight := round(InnerMargin);
|
|
|
case FStyle of
|
|
case FStyle of
|
|
|
bbtDropDown:
|
|
bbtDropDown:
|
|
|
case FDropDownPosition of
|
|
case FDropDownPosition of
|