Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Common/Vcl.Styles.Ext.pas
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,19 @@ class function TStyleManagerHelper.RegisteredStyles: TDictionary<string, TSource
006CD071 07 pop es 006CD076 FFFF db $ff $ff
}
// Use the address of the Self.Flags property to calculate the offset of the FRegisteredStyles
//>>>
{$IF (CompilerVersion < 35)}
//<<<
{$IFDEF CPUX64}
p := Pointer(PByte(@Self.Flags) + 8);
{$ELSE}

p := Pointer(PByte(@Self.Flags) + 4);

{$ENDIF CPUX64}
//>>>
{$IFEND}
//<<<

{$IF (CompilerVersion >= 35)} //Alexandria.
with Self do
Expand Down
7 changes: 0 additions & 7 deletions Common/Vcl.Styles.FontAwesome.pas
Original file line number Diff line number Diff line change
Expand Up @@ -848,13 +848,6 @@ procedure TFontAwesome.DrawChar(DC: HDC; const AChar: Char; DestRect: TRect;
type
TCustomActivityIndicatorShadow = class(TCustomControl)
private
FAnimate: Boolean;
FIndicatorColor: TActivityIndicatorColor;
FIndicatorSize: TActivityIndicatorSize;
FIndicatorType: TActivityIndicatorType;
FFrameDelay: Word;
FFrameIndex: Integer;
FTimer: TTimer;
FFrameList: TImageList;
FFrameCount: Integer;
FFrameSize: Integer;
Expand Down
2 changes: 2 additions & 0 deletions Common/Vcl.Styles.Utils.SystemMenu.pas
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ procedure TVclStylesSystemMenu.CreateMenuStyles;
LSysMenu := GetSystemMenu(FForm.Handle, False);

LSubMenuIndex := GetMenuItemCount(LSysMenu);
if LSubMenuIndex = -1 then //Support for TFrame
exit;
AddMenuSeparatorHelper(LSysMenu, LSubMenuIndex);

FVCLStylesMenu := CreatePopupMenu();
Expand Down