Added support for Rad Studio 10 Seattle

Author: RRUZ

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Fixes.pas

@@ -37,9 +37,10 @@ interface
  Vcl.ExtCtrls,
  Vcl.Graphics;
 
-{$IF CompilerVersion = 23.0}
+{$IF CompilerVersion >= 23.0}
 type
  /// <summary> The <c>TButtonStyleHookFix</c> vcl style hook fix these QC #103708, #107764 for Delphi XE2
+ /// and the https://quality.embarcadero.com/browse/RSP-11619 issue present in X2-XE8
  /// </summary>
  /// <remarks>
  /// Use this hook in this way
@@ -103,6 +104,7 @@ implementation
 uses
  Winapi.CommCtrl,
  Vcl.Themes,
+ Vcl.Forms,
  System.Classes,
  System.UITypes,
  System.Types;
@@ -111,7 +113,7 @@ implementation
  TCustomButtonClass = class(TCustomButton);
  TWinControlClass = class(TWinControl);
 
-{$IF CompilerVersion = 23.0}
+{$IF CompilerVersion >= 23.0}
 
  // we need this helper to access some strict private fields
  TButtonStyleHookHelper = class Helper for TButtonStyleHook
@@ -133,7 +135,7 @@ TComboBoxExStyleHookHelper = class helper for TComboBoxExStyleHook
  end;
 {$IFEND}
 
-{$IF CompilerVersion = 23.0}
+{$IF CompilerVersion >= 23.0}
 
 procedure TButtonStyleHookFix.Paint(Canvas: TCanvas);
 const
@@ -154,55 +156,42 @@ procedure TButtonStyleHookFix.Paint(Canvas: TCanvas);
  BufferLength: Integer;
  SaveIndex: Integer;
  X, Y, I: Integer;
+ IsDefault: Boolean;
  BCaption: String;
  LImageIndex: Integer;
 begin
- // LImageIndex:=PBS_NORMAL;
+ LImageIndex:=PBS_NORMAL;
+ IsDefault := (Control is TCustomButton) and (TCustomButton(Control).Default);
 
  if StyleServices.Available then
  begin
  BCaption := Text;
+
+ if not Control.Enabled then
+ begin
+ LDetails := StyleServices.GetElementDetails(tbPushButtonDisabled);
+ LImageIndex := PBS_DISABLED;
+ end
+ else
  if Pressed then
  begin
  LDetails := StyleServices.GetElementDetails(tbPushButtonPressed);
  LImageIndex := PBS_PRESSED;
  end
- else if MouseInControl then
+ else
+ if MouseInControl then
  begin
  LDetails := StyleServices.GetElementDetails(tbPushButtonHot);
  LImageIndex := PBS_HOT;
  end
- else if Focused then
+ else
+ if Focused or (IsDefault and (Screen.ActiveControl<>nil) and not (Screen.ActiveControl is TCustomButton) ) then
  begin
- if not Control.Enabled then
- begin
- LDetails := StyleServices.GetElementDetails(tbPushButtonDisabled);
- LImageIndex := PBS_DISABLED;
- end
- else
- begin
- // if MouseInControl then
- begin
- LDetails := StyleServices.GetElementDetails(tbPushButtonDefaulted);
- LImageIndex := PBS_DEFAULTED;
- end;
- (* else
- begin
- LDetails := StyleServices.GetElementDetails(tbPushButtonNormal);
- LImageIndex := PBS_NORMAL;
- end; *)
- end;
+ LDetails := StyleServices.GetElementDetails(tbPushButtonDefaulted);
+ LImageIndex := PBS_DEFAULTED;
  end
  else if Control.Enabled then
- begin
  LDetails := StyleServices.GetElementDetails(tbPushButtonNormal);
- LImageIndex := PBS_NORMAL;
- end
- else
- begin
- LDetails := StyleServices.GetElementDetails(tbPushButtonDisabled);
- LImageIndex := PBS_DISABLED;
- end;
 
  DrawRect := Control.ClientRect;
  StyleServices.DrawElement(Canvas.Handle, LDetails, DrawRect);

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Hooks.pas

@@ -534,7 +534,8 @@ function Detour_LoadImageW(hInst: HINST; ImageName: LPCWSTR; ImageType: UINT; X,
  :
  begin
  //OutputDebugString(PChar('GetModuleName '+GetModuleName(hInst)));
- Exit(AwesomeFont.GetIcon(fa_check_square_o, 16, 16, StyleServices.GetSystemColor(clWindowText), StyleServices.GetSystemColor(clWindow), 0));
+ Exit(AwesomeFont.GetIcon(fa_thumb_tack, 16, 16, 12, 12, StyleServices.GetSystemColor(clWindowText), StyleServices.GetSystemColor(clWindow), 0));
+ //Exit(AwesomeFont.GetIcon(fa_check_square_o, 16, 16, StyleServices.GetSystemColor(clWindowText), StyleServices.GetSystemColor(clWindow), 0));
  end;
  end;
 

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.NC.pas

@@ -28,10 +28,10 @@ interface
  System.Classes,
  System.Generics.Collections,
  System.Types,
- System.UITypes,
  Winapi.Windows,
  Winapi.Messages,
  Vcl.ImgList,
+ System.UITypes,
  Vcl.Graphics,
  Vcl.Themes,
  Vcl.Styles,
@@ -82,6 +82,8 @@ TNCControls = class(TComponent)
  procedure SetImages(const Value: TCustomImageList);
  procedure SetShowSystemMenu(const Value: Boolean);
  procedure SetShowCaption(const Value: Boolean);
+ function GetActiveTabButtonIndex: Integer;
+ procedure SetActiveTabButtonIndex(const Value: Integer);
  property FormBorderSize : TRect read FFormBorderSize write FFormBorderSize;
  property Form : TCustomForm read FForm;
  public
@@ -93,6 +95,9 @@ TNCControls = class(TComponent)
  constructor Create(AOwner: TComponent);override;
  destructor Destroy; override;
  published
+
+ property ActiveTabButtonIndex : Integer read GetActiveTabButtonIndex write SetActiveTabButtonIndex;
+
  property ButtonsList : TListNCButtons read FButtons;
  property Visible : Boolean read FVisible write SetVisible default True;
  property Images: TCustomImageList read FImages write SetImages;
@@ -166,7 +171,6 @@ TNCButton = class(TCollectionItem)
  procedure SetShowHint(const Value: Boolean);
  procedure SetName(const Value: TComponentName);
  procedure SetUseFontAwesome(const Value: Boolean);
- property TabIndex : Integer read GetTabIndex;
  protected
  procedure SetBounds(ALeft, ATop, AWidth, AHeight: Integer); virtual;
  public
@@ -179,6 +183,7 @@ TNCButton = class(TCollectionItem)
  property Height: Integer read FHeight write SetHeight;
  property NCControls: TNCControls read FNCControls;
  property BoundsRect: TRect read GetBoundsRect write SetBoundsRect;
+ property TabIndex : Integer read GetTabIndex;
  published
  property Style: TNCButtonStyle read FStyle write SetStyle;
 
@@ -209,6 +214,7 @@ TNCButton = class(TCollectionItem)
  property Name: TComponentName read FName write SetName stored False;
  property Tag: NativeInt read FTag write FTag default 0;
 
+
  property UseFontAwesome : Boolean read FUseFontAwesome write SetUseFontAwesome;
 
  property OnDropDownClick: TNotifyEvent read FOnDropDownClick write FOnDropDownClick;
@@ -331,9 +337,14 @@ destructor TNCControls.Destroy;
 end;
 
 
+function TNCControls.GetActiveTabButtonIndex: Integer;
+begin
+ Result:= FActiveTabButtonIndex;
+end;
+
 function TNCControls.GetButton(index: Integer): TNCButton;
 begin
- Result:=FButtons[Index];
+ Result:= FButtons[Index];
 end;
 
 function TNCControls.GetCount: Integer;
@@ -354,6 +365,30 @@ procedure TNCControls.Invalidate;
  SendMessage(FForm.Handle, WM_NCPAINT, 0, 0);
 end;
 
+procedure TNCControls.SetActiveTabButtonIndex(const Value: Integer);
+
+ function GetMaxTabIndex : Integer;
+ var
+ i : integer;
+ begin
+ Result:=-1;
+ For i:=0 to FButtons.Count-1 do
+ if FButtons[i].Style=nsTab then
+ Inc(Result);
+ end;
+
+var
+ lmax, i : Integer;
+begin
+ lmax:=GetMaxTabIndex;
+ if (Value<>FActiveTabButtonIndex) and (Value>=0) and (lmax>=0) and (Value<=lmax) then
+ begin
+ FActiveTabButtonIndex:=Value;
+ Invalidate;
+ end;
+
+end;
+
 procedure TNCControls.SetImages(const Value: TCustomImageList);
 begin
  FImages := Value;

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Utils.ComCtrls.pas

@@ -415,14 +415,14 @@ procedure TSysListViewStyleHook.UpdateColors;
  if OverrideEraseBkgnd then
  Color := StyleServices.GetStyleColor(scListView)
  else
- Color := clWhite;
+ Color := clWindow;
  if OverrideFont then
  FontColor := StyleServices.GetSystemColor(clWindowText)
  else
  FontColor := clWindowText;
 
- ListView_SetBkColor(Handle, Color);
- ListView_SetTextBkColor(Handle, Color);
+ ListView_SetBkColor(Handle, ColorToRGB(Color));
+ ListView_SetTextBkColor(Handle, ColorToRGB(Color));
  ListView_SetTextColor(Handle, ColorToRGB(FontColor));
 
 end;
@@ -828,8 +828,8 @@ procedure TSysTreeViewStyleHook.WndProc(var Message: TMessage);
  if (TreeView_GetBkColor(Handle) <> COLORREF(Color)) then
  begin
  // SetWindowTheme(Handle, '', '');
- TreeView_SetBkColor(Handle, Color);
- TreeView_SetTextColor(Handle, FontColor);
+ TreeView_SetBkColor(Handle, ColorToRGB(Color));
+ TreeView_SetTextColor(Handle, ColorToRGB(FontColor));
  end;
  Message.Result := CallDefaultProc(Message);
  Exit;

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Utils.Graphics.pas

@@ -580,6 +580,7 @@ TAwesomeFont = class
  procedure DrawChar(DC: HDC; const AChar: Char; DestRect: TRect; AColor : TColor; Orientation : Integer = 0; ImageAlignment: TImageAlignment = iaLeft); overload;
  procedure DrawChar(DC: HDC; const ACode: Word; DestRect: TRect; AColor : TColor; Orientation : Integer = 0; ImageAlignment: TImageAlignment = iaLeft); overload;
  function GetIcon(const ACode: Word; Width, Height : Integer; AColor, ABackColor : TColor; Orientation : Integer = 0; ImageAlignment: TImageAlignment = iaLeft) : HICON; overload;
+ function GetIcon(const ACode: Word; Width, Height, CharX, CharY : Integer; AColor, ABackColor : TColor; Orientation : Integer = 0; ImageAlignment: TImageAlignment = iaLeft) : HICON; overload;
  end;
 
 
@@ -2769,7 +2770,9 @@ procedure TAwesomeFont.DrawChar(DC: HDC; const ACode: Word; DestRect: TRect; ACo
  DrawChar(DC, Chr(ACode), DestRect, AColor, Orientation, ImageAlignment);
 end;
 
-function TAwesomeFont.GetIcon(const ACode: Word; Width, Height: Integer; AColor, ABackColor: TColor; Orientation: Integer = 0; ImageAlignment: TImageAlignment = iaLeft): HICON;
+function TAwesomeFont.GetIcon(const ACode: Word; Width, Height, CharX,
+ CharY: Integer; AColor, ABackColor: TColor; Orientation: Integer;
+ ImageAlignment: TImageAlignment): HICON;
 var
  LIconInfo : TIconInfo;
  LBitmap, LMask : TBitmap;
@@ -2783,7 +2786,8 @@ function TAwesomeFont.GetIcon(const ACode: Word; Width, Height: Integer; AColor,
  //LBitmap.Canvas.FillRect(Rect(0, 0, LBitmap.Width, LBitmap.Height));
  //Bitmap32_SetAlphaAndColor(LBitmap, 255, clFuchsia);
 
- DrawChar(LBitmap.Canvas.Handle, ACode, Rect(0, 0, LBitmap.Width, LBitmap.Height), AColor, Orientation, ImageAlignment);
+ //DrawChar(LBitmap.Canvas.Handle, ACode, Rect(0, 0, LBitmap.Width, LBitmap.Height), AColor, Orientation, ImageAlignment);
+ DrawChar(LBitmap.Canvas.Handle, ACode, Rect(0, 0, CharX, CharY), AColor, Orientation, ImageAlignment);
  Bitmap32_SetAlphaExceptColor(LBitmap, 255, ABackColor);
  LBitmap.AlphaFormat := afDefined;
 
@@ -2808,6 +2812,12 @@ function TAwesomeFont.GetIcon(const ACode: Word; Width, Height: Integer; AColor,
  LBitmap.Free;
  end;
 end;
+
+
+function TAwesomeFont.GetIcon(const ACode: Word; Width, Height: Integer; AColor, ABackColor: TColor; Orientation: Integer = 0; ImageAlignment: TImageAlignment = iaLeft): HICON;
+begin
+ Result:=GetIcon(ACode, Width, Height, Width, Height, AColor, ABackColor, Orientation, ImageAlignment);
+end;
 procedure TAwesomeFont.DrawChar(DC: HDC; const AChar: Char; DestRect: TRect; AColor: TColor; Orientation : Integer = 0; ImageAlignment: TImageAlignment = iaLeft);
 var
  LogFont: TLogFont;

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Utils.Menus.pas

@@ -436,14 +436,14 @@ procedure TSysPopupStyleHook.DrawItem(Canvas: TCanvas; const Index: integer; con
  LogFont.lfFaceName := 'Marlett';
 
  if Disabled then
- oldColor := StyleServices.GetStyleFontColor(sfPopupMenuItemTextDisabled)
+ oldColor := ColorToRGB(StyleServices.GetStyleFontColor(sfPopupMenuItemTextDisabled))
  else
  begin
- oldColor := StyleServices.GetStyleFontColor(sfPopupMenuItemTextNormal);
+ oldColor := ColorToRGB(StyleServices.GetStyleFontColor(sfPopupMenuItemTextNormal));
  if isHot in State then
- oldColor := StyleServices.GetStyleFontColor(sfPopupMenuItemTextHot);
+ oldColor := ColorToRGB(StyleServices.GetStyleFontColor(sfPopupMenuItemTextHot));
  if isDisabled in State then
- oldColor := StyleServices.GetStyleFontColor(sfPopupMenuItemTextDisabled);
+ oldColor := ColorToRGB(StyleServices.GetStyleFontColor(sfPopupMenuItemTextDisabled));
  end;
 
  AFont := CreateFontIndirect(LogFont);

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Utils.ScreenTips.pas

@@ -89,14 +89,14 @@ procedure TSysTooltipsStyleHook.PaintHint(Canvas: TCanvas; TextRect: TRect);
  { Draw Tooltips Face }
  GradientFillCanvas(Canvas, GradientStartColor, GradientEndColor, SysControl.ClientRect, gdVertical);
  { Draw Tooltips Border }
- Brush := CreateSolidBrush(BkColor);
+ Brush := CreateSolidBrush(ColorToRGB(BkColor));
  FrameRect(DC, SysControl.ClientRect, Brush);
  DeleteObject(Brush);
  { Use default font for Tooltips text }
  SelectObject(DC, Screen.HintFont.Handle);
  { Draw Tooltips Text }
  SetBkMode(DC, TRANSPARENT);
- SetTextColor(DC, TextColor);
+ SetTextColor(DC, ColorToRGB(TextColor));
  AText := PChar(SysControl.Text);
  Winapi.Windows.DrawText(DC, AText, -1, TextRect, DT_LEFT);
 end;

delphi-ide-theme-editor/Common/Vcl Styles Utils/Vcl.Styles.Utils.SysStyleHook.pas

@@ -637,16 +637,16 @@ function TSysStyleHook.DrawText(DC: HDC; Details: TThemedElementDetails; S: Stri
 var
  DrawFlags: Cardinal;
  SaveIndex: Integer;
- sColor: TColor;
+ LColor: TColor;
 begin
  SaveIndex := SaveDC(DC);
  try
  SetBkMode(DC, TRANSPARENT);
- if not StyleServices.GetElementColor(Details, ecTextColor, sColor) then
- sColor := FontColor;
+ if not StyleServices.GetElementColor(Details, ecTextColor, LColor) then
+ LColor := FontColor;
  if not OverrideFont then
- sColor := FontColor;
- SetTextColor(DC, sColor);
+ LColor := FontColor;
+ SetTextColor(DC, ColorToRGB(LColor));
  DrawFlags := TTextFormatFlags(Flags);
  Result := Winapi.Windows.DrawText(DC, S, -1, R, DrawFlags);
  finally
@@ -660,16 +660,16 @@ function TSysStyleHook.DrawTextCentered(DC: HDC; Details: TThemedElementDetails;
  DrawFlags: Cardinal;
  DrawParams: TDrawTextParams;
  SaveIndex: Integer;
- sColor: TColor;
+ LColor: TColor;
 begin
  SaveIndex := SaveDC(DC);
  try
  SetBkMode(DC, TRANSPARENT);
- if not StyleServices.GetElementColor(Details, ecTextColor, sColor) then
- sColor := FontColor;
+ if not StyleServices.GetElementColor(Details, ecTextColor, LColor) then
+ LColor := FontColor;
  if not OverrideFont then
- sColor := FontColor;
- SetTextColor(DC, sColor);
+ LColor := FontColor;
+ SetTextColor(DC, ColorToRGB(LColor));
  DrawRect := R;
  DrawFlags := DT_END_ELLIPSIS or DT_WORDBREAK or DT_EDITCONTROL or DT_CENTER;
  if DrawFlags <> 0 then