From: <aka...@us...> - 2024-06-09 16:07:37
|
Revision: 4263 http://sourceforge.net/p/gexperts/code/4263 Author: akalwahome Date: 2024-06-09 16:07:34 +0000 (Sun, 09 Jun 2024) Log Message: ----------- Merged from trunk Modified Paths: -------------- branches/dark-mode/ExternalSource/dzlib/u_dzFileUtils.pas branches/dark-mode/ExternalSource/dzlib/u_dzLineBuilder.pas branches/dark-mode/ExternalSource/dzlib/u_dzSpeedBitBtn.pas branches/dark-mode/ExternalSource/dzlib/u_dzVclUtils.pas branches/dark-mode/Source/AutoTodo/GX_InsertAutoTodo.pas branches/dark-mode/Source/BackupProject/GX_BackupConfig.pas branches/dark-mode/Source/ClipboardHistory/GX_ClipboardOptions.pas branches/dark-mode/Source/Editor/GX_eAlignOptions.pas branches/dark-mode/Source/Editor/GX_eComment.pas branches/dark-mode/Source/Editor/GX_eDate.pas branches/dark-mode/Source/Editor/GX_ePasteAs.pas branches/dark-mode/Source/Editor/GX_eSort.pas branches/dark-mode/Source/Editor/GX_eSortOptions.pas branches/dark-mode/Source/Editor/GX_eWarn.pas branches/dark-mode/Source/ExplicitFilter/GX_ExplicitFilterExpert.pas branches/dark-mode/Source/Goto/GX_GotoConfig.pas branches/dark-mode/Source/Grep/GX_GrepMenuConfig.pas branches/dark-mode/Source/Grep/GX_GrepOptions.pas branches/dark-mode/Source/Grep/GX_GrepResultsOptions.pas branches/dark-mode/Source/MacroLibrary/GX_MacroLibraryConfig.pas branches/dark-mode/Source/MacroLibrary/GX_MacroLibraryEditEntry.pas branches/dark-mode/Source/MessageDialog/GX_MessageOptions.pas branches/dark-mode/Source/ProcedureList/GX_ProcedureListOptions.pas branches/dark-mode/Source/ProjectDependencies/GX_ProjDependOptions.pas Property Changed: ---------------- branches/dark-mode/ Index: branches/dark-mode =================================================================== --- branches/dark-mode 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode 2024-06-09 16:07:34 UTC (rev 4263) Property changes on: branches/dark-mode ___________________________________________________________________ Modified: svn:mergeinfo ## -1 +1 ## -/trunk:4085-4256 \ No newline at end of property +/trunk:4085-4262 \ No newline at end of property Modified: branches/dark-mode/ExternalSource/dzlib/u_dzFileUtils.pas =================================================================== --- branches/dark-mode/ExternalSource/dzlib/u_dzFileUtils.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/ExternalSource/dzlib/u_dzFileUtils.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -1580,10 +1580,21 @@ // declared wrongly in WINDOWS +{$IFDEF UNICODE} function GetVolumeInformation(lpRootPathName: PChar; lpVolumeNameBuffer: PChar; nVolumeNameSize: DWORD; lpVolumeSerialNumber: PDWORD; lpMaximumComponentLength, lpFileSystemFlags: LPDWORD; + lpFileSystemNameBuffer: PChar; nFileSystemNameSize: DWORD): BOOL; stdcall; external kernel32 Name 'GetVolumeInformationW'; +function GetVolumeInformationA(lpRootPathName: PAnsiChar; + lpVolumeNameBuffer: PAnsiChar; nVolumeNameSize: DWORD; lpVolumeSerialNumber: PDWORD; + lpMaximumComponentLength, lpFileSystemFlags: LPDWORD; + lpFileSystemNameBuffer: PAnsiChar; nFileSystemNameSize: DWORD): BOOL; stdcall; external kernel32 Name 'GetVolumeInformationA'; +{$ELSE} +function GetVolumeInformation(lpRootPathName: PChar; + lpVolumeNameBuffer: PChar; nVolumeNameSize: DWORD; lpVolumeSerialNumber: PDWORD; + lpMaximumComponentLength, lpFileSystemFlags: LPDWORD; lpFileSystemNameBuffer: PChar; nFileSystemNameSize: DWORD): BOOL; stdcall; external kernel32 Name 'GetVolumeInformationA'; +{$ENDIF} class function TFileSystem.GetVolumeName(_DriveLetter: Char): string; begin @@ -1982,14 +1993,14 @@ end; end; -{$if not declared(MOVEFILE_WRITE_THROUGH)} +{$IF not declared(MOVEFILE_WRITE_THROUGH)} const - MOVEFILE_WRITE_THROUGH = $00000008; -{$ifend} -{$if not declared(MOVEFILE_FAIL_IF_NOT_TRACKABLE)} + MOVEFILE_WRITE_THROUGH = $00000008; +{$IFEND} +{$IF not declared(MOVEFILE_FAIL_IF_NOT_TRACKABLE)} const - MOVEFILE_FAIL_IF_NOT_TRACKABLE = $00000020; -{$ifend} + MOVEFILE_FAIL_IF_NOT_TRACKABLE = $00000020; +{$IFEND} class function TFileSystem.MoveFileEx(const _Source, _Dest: string; _Flags: TMoveFileExFlagSet; _ErrorHandling: TErrorHandlingEnum = ehRaiseException): Boolean; Modified: branches/dark-mode/ExternalSource/dzlib/u_dzLineBuilder.pas =================================================================== --- branches/dark-mode/ExternalSource/dzlib/u_dzLineBuilder.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/ExternalSource/dzlib/u_dzLineBuilder.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -22,6 +22,7 @@ FQuoteChar: Char; FColumnCount: Integer; FForceQuoted: Boolean; + FIgnoreEmpty: Boolean; function GetDecimalSeparator: Char; procedure SetDecimalSeparator(_Value: Char); public @@ -76,11 +77,42 @@ ///<summary> If set to true, every column will be enclosed in quotes </summary> property ForceQuoted: Boolean read FForceQuoted write FForceQuoted; property QuoteChar: Char read FQuoteChar write FQuoteChar; + ///<summary> + /// If set to True, adding empty strings will not change the content -> no empty columns will be added + /// Default: False </summary> + property IgnoreEmpty: Boolean read FIgnoreEmpty write FIgnoreEmpty; {$IF Declared(TFormatSettings)} property FormatSettings: TFormatSettings read FFormatSettings; {$IFEND} end; +{$IFDEF SUPPORTS_ENHANCED_RECORDS} +type + ///<summary> + /// A very simple version of the line builder that only generates a comma separated string and + /// ignores empty strings. </summary> + TCommaSepStringBuilderRec = record + private + FSeparator: string; + FValue: string; + function GetSeparator: string; + public + procedure Clear; + ///<summary> + /// Appends a string, if it is not empty. Inserts the separator string in front of it, if Value + /// is not empty. if Value = '' then Value := _s; if_s = '' then Value remains unchanged, + /// otherwise Value := Value + Separator + _s </summary> + procedure Append(const _s: string); + property Value: string read FValue; + ///<summary> + /// The string used to separate strings appended, defaults to ',' + /// @NOTE: For better readability, you might want to set it to ', ' instead. </summary> + property Separator: string read GetSeparator write FSeparator; + class operator Implicit(_a: TCommaSepStringBuilderRec): string; + class operator Add(_a: TCommaSepStringBuilderRec; _b: string): TCommaSepStringBuilderRec; + end; +{$ENDIF} + implementation uses @@ -211,6 +243,8 @@ var s: string; begin + if (_Column = '') and (FIgnoreEmpty) then + Exit; //==> if FColumnCount > 0 then FContent := FContent + FListSeparator; if FForceQuoted then @@ -309,4 +343,42 @@ FColumnCount := FColumnCount + _Line.ColumnCount; end; +{$IFDEF SUPPORTS_ENHANCED_RECORDS} +{ TCommaSepListBuilderRec } + +procedure TCommaSepStringBuilderRec.Append(const _s: string); +begin + if _s = '' then + Exit; //==> + + if FValue <> '' then + FValue := FValue + GetSeparator; + FValue := FValue + _s; +end; + +procedure TCommaSepStringBuilderRec.Clear; +begin + FValue := ''; +end; + +function TCommaSepStringBuilderRec.GetSeparator: string; +begin + Result := FSeparator; + if Result = '' then + Result := ',' + else +end; + +class operator TCommaSepStringBuilderRec.Implicit(_a: TCommaSepStringBuilderRec): string; +begin + Result := _a.FValue; +end; + +class operator TCommaSepStringBuilderRec.Add(_a: TCommaSepStringBuilderRec; _b: string): TCommaSepStringBuilderRec; +begin + Result := _a; + Result.Append(_b); +end; +{$ENDIF} + end. Modified: branches/dark-mode/ExternalSource/dzlib/u_dzSpeedBitBtn.pas =================================================================== --- branches/dark-mode/ExternalSource/dzlib/u_dzSpeedBitBtn.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/ExternalSource/dzlib/u_dzSpeedBitBtn.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -17,7 +17,12 @@ u_dzVclUtils, u_dzTranslator; +{$IF not declared(NativeInt)} type + NativeInt = Integer; +{$IFEND} + +type EdzSpeedButton = class(EdzException); type @@ -33,6 +38,9 @@ /// Note: Actions do not work.</summary> TdzSpeedBitBtn = class(TWindowProcHook) private + FColorRaised: TColor; + FColorSunken: TColor; + FColorText: TColor; FCaption: string; FUpGlyph: TBitmap; FDownGlyph: TBitmap; @@ -49,8 +57,7 @@ procedure SetDown(const Value: Boolean); procedure UpdateGlyph; function GetBitBtn: TBitBtn; - procedure PrepareBmp(_w, _h: Integer; _Color: TColor; _Edge: UINT; _Glyph: TBitmap; - _bmp: TBitmap); + procedure PrepareBmp(_w, _h: Integer; _Color: TColor; _Edge: UINT; _Glyph: TBitmap; _bmp: TBitmap); procedure PrepareBmps(_UpBmp, _DownBmp: TBitmap); protected procedure NewWindowProc(var _Msg: TMessage); override; @@ -58,6 +65,7 @@ constructor Create(_btn: TBitBtn); reintroduce; overload; constructor Create(_btn: TBitBtn; _UpGlyph, _DownGlyph: TBitmap); overload; constructor Create(_btn: TBitBtn; _ImageList: TImageList; _UpGlyphIdx, _DownGlyphIdx: Integer); overload; + constructor Create(_btn: TWinControl; AColorText: TColor = clNone; AColorRaised: TColor = clNone; AColorSunken: TColor = clNone); overload; destructor Destroy; override; property Down: Boolean read GetDown write SetDown; property BitBtn: TBitBtn read GetBitBtn; @@ -74,6 +82,9 @@ FOnClick: TNotifyEvent; FList: TList; FAllowAllUp: Boolean; + FColorRaised: TColor; + FColorSunken: TColor; + FColorText: TColor; procedure HandleClick(_Sender: TObject); procedure doOnClick; function TryGetSelectedSb(out _Idx: Integer; out _sb: TdzSpeedBitBtn): Boolean; @@ -82,7 +93,7 @@ destructor Destroy; override; function Add(_btn: TBitBtn): TdzSpeedBitBtn; overload; function Add(_btn: TBitBtn; _Data: Pointer): TdzSpeedBitBtn; overload; - function Add(_btn: TBitBtn; _Data: Integer): TdzSpeedBitBtn; overload; + function Add(_btn: TBitBtn; _Data: NativeInt): TdzSpeedBitBtn; overload; ///<summary> /// Sets the given button's down state to False, if allowed /// @param Idx is the index of the button to change @@ -110,13 +121,26 @@ function TryGetSelected(out _Data: Pointer): Boolean; overload; property AllowAllUp: Boolean read FAllowAllUp write FAllowAllUp; property OnClick: TNotifyEvent read FOnClick write FOnClick; - end; + property ColorRaised: TColor read FColorRaised write FColorRaised default clNone; + property ColorSunken: TColor read FColorSunken write FColorSunken default clNone; + property ColorText: TColor read FColorText write FColorText default clNone; end; implementation +{$IF CompilerVersion >= 35} // Delphi 11 and up. + {$DEFINE USE_THEMING} +{$IFEND} + uses Math, Forms, +{$IFDEF USE_THEMING} + UxTheme, + Themes, + {$IFDEF USE_IDE_THEMING} + GX_OtaUtils, + {$ENDIF} +{$ENDIF} u_dzGraphicsUtils, u_dzMiscUtils; @@ -166,6 +190,20 @@ UpdateGlyph; end; +constructor TdzSpeedBitBtn.Create(_btn: TWinControl; + AColorText, AColorRaised, AColorSunken: TColor); +begin + inherited Create(_btn); + + FColorRaised := AColorRaised; + FColorSunken := AColorSunken; + FColorText := AColorText; + + if FColorRaised = clNone then FColorRaised := RGB(240, 240, 240); // clBtnFace; + if FColorSunken = clNone then FColorSunken := RGB(245, 245, 245); // a bit lighter than clBtnFace; + if FColorText = clNone then FColorText := RGB(0, 0, 0); // Black +end; + constructor TdzSpeedBitBtn.Create(_btn: TBitBtn; _ImageList: TImageList; _UpGlyphIdx, _DownGlyphIdx: Integer); var @@ -204,10 +242,14 @@ begin w := BitBtn.ClientWidth; h := BitBtn.ClientHeight; + BitBtn.Spacing := 0; ColBack1 := RGB(240, 240, 240); // clBtnFace; ColBack2 := RGB(245, 245, 245); // a bit lighter than clBtnFace; + if FColorRaised <> clNone then ColBack1 := FColorRaised; + if FColorSunken <> clNone then ColBack2 := FColorSunken; + PrepareBmp(w, h, ColBack1, EDGE_RAISED, FUpGlyph, FUpBmp); PrepareBmp(w, h, ColBack2, EDGE_SUNKEN, FDownGlyph, FDownBmp); end; @@ -216,6 +258,11 @@ _bmp: TBitmap); var cnv: TCanvas; +{$IFDEF USE_THEMING} + LStyleService : TCustomStyleServices; + LDetails : TThemedElementDetails; + DC : HDC; +{$ENDIF} procedure HandleBmpOnly; var @@ -247,7 +294,21 @@ HorizontalAlignment := dthaLeft; r := Rect(X + 2, 0, _w - 3, _h); end; - TCanvas_DrawTextSingleLine(cnv, FCaption, r, HorizontalAlignment, dtvaCenter, []); +{$IFDEF USE_THEMING} + if Assigned(LStyleService) and (LStyleService.Enabled) then + begin + LStyleService.DrawText( + DC, + LDetails, + FCaption, + R, + [tfCenter, tfVerticalCenter, tfSingleLine], + FColorText + ); + end + else +{$ENDIF} + TCanvas_DrawTextSingleLine(cnv, FCaption, r, HorizontalAlignment, dtvaCenter, []); end; procedure HandleTextOnlyMultiLine; @@ -386,14 +447,40 @@ _bmp.Height := _h; _bmp.TransparentColor := clFuchsia; +{$IFDEF USE_THEMING} + _bmp.PixelFormat := pfDevice; cnv := _bmp.Canvas; - cnv.Brush.Color := _Color; - cnv.Brush.Style := bsSolid; - cnv.FillRect(Rect(0, 0, _w, _h)); + {$IFDEF USE_IDE_THEMING} + LStyleService := IdeStyleService; + {$ELSE} + LStyleService := Themes.StyleServices; + {$ENDIF} + if Assigned(LStyleService) and LStyleService.Enabled then + begin + R := Rect(0, 0, _w, _h); + if _Edge = EDGE_SUNKEN then // "down" + begin + LDetails := LStyleService.GetElementDetails(TThemedButton.tbPushButtonPressed); + FColorText := LStyleService.GetStyleFontColor(TStyleFont.sfButtonTextPressed); + end + else begin // "up" + LDetails := LStyleService.GetElementDetails(TThemedButton.tbPushButtonNormal); + FColorText := LStyleService.GetStyleFontColor(TStyleFont.sfButtonTextNormal); + end; + LStyleService.DrawElement(DC, LDetails, R, nil, 0); +// _bmp.Canvas.Pixels[0, 0] := clFuchsia; + end + else +{$ENDIF USE_THEMING} + begin + cnv := _bmp.Canvas; + cnv.Brush.Color := _Color; + cnv.Brush.Style := bsSolid; + cnv.FillRect(Rect(0, 0, _w, _h)); - r := Rect(0, 0, _w - 1, _h - 2); - DrawEdge(cnv.Handle, r, _Edge, BF_RECT); - + r := Rect(0, 0, _w - 1, _h - 2); + DrawEdge(cnv.Handle, r, _Edge, BF_RECT); + end; cnv.Brush.Style := bsClear; cnv.Font := BitBtn.Font; @@ -485,6 +572,9 @@ begin inherited Create; FList := TList.Create; + FColorRaised := clNone; + FColorSunken := clNone; + FColorText := clNone; end; destructor TdzSpeedBitBtnGroup.Destroy; @@ -496,7 +586,10 @@ function TdzSpeedBitBtnGroup.Add(_btn: TBitBtn; _Data: Pointer): TdzSpeedBitBtn; begin _btn.OnClick := Self.HandleClick; - Result := TdzSpeedBitBtn.Create(_btn); +{$IFDEF USE_THEMING} + _btn.StyleElements := []; +{$ENDIF} + Result := TdzSpeedBitBtn.Create(_btn, FColorText, FColorRaised, FColorSunken); Result.Data := _Data; FList.Add(Result); end; @@ -506,7 +599,7 @@ Result := Add(_btn, nil); end; -function TdzSpeedBitBtnGroup.Add(_btn: TBitBtn; _Data: Integer): TdzSpeedBitBtn; +function TdzSpeedBitBtnGroup.Add(_btn: TBitBtn; _Data: NativeInt): TdzSpeedBitBtn; begin Result := Add(_btn, Pointer(_Data)); //FI:W541 Casting from Integer to Pointer type (or vice versa) end; Modified: branches/dark-mode/ExternalSource/dzlib/u_dzVclUtils.pas =================================================================== --- branches/dark-mode/ExternalSource/dzlib/u_dzVclUtils.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/ExternalSource/dzlib/u_dzVclUtils.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -1133,11 +1133,24 @@ function TRadioGroup_GetItemCaption(_rg: TCustomRadioGroup; out _Caption: string; _Idx: Integer = -1): Boolean; -///<summary> Selects the item in the radio group with the given caption, -/// returns the item's index or -1 if no item matched. -/// Comparison is case insensitive </summary> +///<summary> +/// Selects the item in the radio group with the given caption, +/// @returns the item's index or -1 if no item matched. +/// @NOTE: Comparison is case insensitive </summary> function TRadioGroup_Select(_rg: TCustomRadioGroup; const _Item: string; _DefaultIdx: Integer = -1): Integer; +///<summary> +/// Selects the item in the radio group with the given object value +/// @returns the item's index or -1 if no item matched. </summary> +function TRadioGroup_SelectByObject(_rg: TCustomRadioGroup; _Obj: Pointer; + _WithClick: Boolean = False; _DefaultIdx: Integer = -1): Integer; overload; + +///<summary> +/// Selects the item in the radio group with the given object value +/// @returns the item's index or -1 if no item matched. </summary> +function TRadioGroup_SelectByObject(_rg: TCustomRadioGroup; _ObjAsInt: Integer; + _WithClick: Boolean = False; _DefaultIdx: Integer = -1): Integer; overload; + procedure TRadioGroup_SelectWithoutClickEvent(_rg: TCustomRadioGroup; _Idx: Integer); ///<summary> Gets the object pointer of the selected RadioGroup item @@ -4235,12 +4248,38 @@ if AnsiSameText(Hack.Items[i], _Item) then begin Hack.ItemIndex := i; Result := Hack.ItemIndex; - Exit; + Exit; //==> end; Hack.ItemIndex := _DefaultIdx; Result := Hack.ItemIndex; end; +function TRadioGroup_SelectByObject(_rg: TCustomRadioGroup; _Obj: Pointer; + _WithClick: Boolean = False; _DefaultIdx: Integer = -1): Integer; +var + Hack: TRadioGroupHack; + i: Integer; +begin + Hack := TRadioGroupHack(_rg); + for i := 0 to Hack.Items.Count - 1 do + if Hack.Items.Objects[i] = _Obj then begin + if _WithClick then + Hack.ItemIndex := i + else + TRadioGroup_SelectWithoutClickEvent(_rg, i); + Result := Hack.ItemIndex; + Exit; //==> + end; + Hack.ItemIndex := _DefaultIdx; + Result := Hack.ItemIndex; +end; + +function TRadioGroup_SelectByObject(_rg: TCustomRadioGroup; _ObjAsInt: Integer; + _WithClick: Boolean = False; _DefaultIdx: Integer = -1): Integer; +begin + Result := TRadioGroup_SelectByObject(_rg, Pointer(_ObjAsInt), _WithClick, _DefaultIdx); +end; + procedure TRadioGroup_SelectWithoutClickEvent(_rg: TCustomRadioGroup; _Idx: Integer); var Hack: TRadioGroupHack; Modified: branches/dark-mode/Source/AutoTodo/GX_InsertAutoTodo.pas =================================================================== --- branches/dark-mode/Source/AutoTodo/GX_InsertAutoTodo.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/AutoTodo/GX_InsertAutoTodo.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -324,6 +324,7 @@ i: Integer; begin inherited; + TControl_SetMinConstraints(Self); Placeholders := TStringList.Create; try TAutoTodoHandler.GetPlaceholders(Placeholders); Modified: branches/dark-mode/Source/BackupProject/GX_BackupConfig.pas =================================================================== --- branches/dark-mode/Source/BackupProject/GX_BackupConfig.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/BackupProject/GX_BackupConfig.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -60,6 +60,7 @@ i: Integer; begin inherited; + TControl_SetMinConstraints(Self); TWinControl_ActivateDropFiles(edBackupDir, edBackupDirOnDropFiles); TEdit_ActivateAutoComplete(edBackupDir, [acsFileSystem], [actSuggest]); Modified: branches/dark-mode/Source/ClipboardHistory/GX_ClipboardOptions.pas =================================================================== --- branches/dark-mode/Source/ClipboardHistory/GX_ClipboardOptions.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/ClipboardHistory/GX_ClipboardOptions.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -76,6 +76,8 @@ begin inherited; + TControl_SetMinConstraints(Self); + cbPreviewFont.Items.Assign(Screen.Fonts); InitDpiScaler; Modified: branches/dark-mode/Source/Editor/GX_eAlignOptions.pas =================================================================== --- branches/dark-mode/Source/Editor/GX_eAlignOptions.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Editor/GX_eAlignOptions.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -27,6 +27,9 @@ implementation +uses + u_dzVclUtils; + {$R *.dfm} { TfmAlignOptions } @@ -34,7 +37,7 @@ constructor TfmAlignOptions.Create(_Owner: TComponent); begin inherited; - + TControl_SetMinConstraints(Self); InitDpiScaler; end; Modified: branches/dark-mode/Source/Editor/GX_eComment.pas =================================================================== --- branches/dark-mode/Source/Editor/GX_eComment.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Editor/GX_eComment.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -566,6 +566,7 @@ begin inherited; + TControl_SetMinConstraints(Self); InitDpiScaler; InitializeForm; Modified: branches/dark-mode/Source/Editor/GX_eDate.pas =================================================================== --- branches/dark-mode/Source/Editor/GX_eDate.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Editor/GX_eDate.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -128,6 +128,7 @@ begin inherited; + TControl_SetMinConstraints(Self); InitDpiScaler; end; Modified: branches/dark-mode/Source/Editor/GX_ePasteAs.pas =================================================================== --- branches/dark-mode/Source/Editor/GX_ePasteAs.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Editor/GX_ePasteAs.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -281,6 +281,7 @@ constructor TfmPasteAsConfig.Create(_Owner: TComponent); begin inherited; + TControl_SetMinConstraints(Self); TPasteAsHandler.GetTypeText(cbPasteAsType.Items); cbPasteAsType.DropDownCount := Integer(High(TPasteAsType)) + 1; Modified: branches/dark-mode/Source/Editor/GX_eSort.pas =================================================================== --- branches/dark-mode/Source/Editor/GX_eSort.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Editor/GX_eSort.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -68,6 +68,7 @@ begin inherited; + TControl_SetMinConstraints(Self); InitDpiScaler; end; Modified: branches/dark-mode/Source/Editor/GX_eSortOptions.pas =================================================================== --- branches/dark-mode/Source/Editor/GX_eSortOptions.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Editor/GX_eSortOptions.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -87,6 +87,7 @@ begin inherited; + TControl_SetMinConstraints(Self); InitDpiScaler; end; Modified: branches/dark-mode/Source/Editor/GX_eWarn.pas =================================================================== --- branches/dark-mode/Source/Editor/GX_eWarn.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Editor/GX_eWarn.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -282,9 +282,9 @@ b_ERROR.Visible := False; {$IFEND} + TControl_SetMinConstraints(Self); InitDpiScaler; GxSetDefaultFont(Self); - TControl_SetMinConstraints(Self); FAvailable := TStringList.Create; InitWarnings; Modified: branches/dark-mode/Source/ExplicitFilter/GX_ExplicitFilterExpert.pas =================================================================== --- branches/dark-mode/Source/ExplicitFilter/GX_ExplicitFilterExpert.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/ExplicitFilter/GX_ExplicitFilterExpert.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -367,7 +367,7 @@ constructor TfmGxExplicitFilter.Create(_Owner: TComponent); begin inherited; - + TControl_SetMinConstraints(Self); InitDpiScaler; end; Modified: branches/dark-mode/Source/Goto/GX_GotoConfig.pas =================================================================== --- branches/dark-mode/Source/Goto/GX_GotoConfig.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Goto/GX_GotoConfig.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -53,7 +53,7 @@ constructor Tf_GotoConfig.Create(_Owner: TComponent); begin inherited; - + TControl_SetMinConstraints(Self); InitDpiScaler; end; Modified: branches/dark-mode/Source/Grep/GX_GrepMenuConfig.pas =================================================================== --- branches/dark-mode/Source/Grep/GX_GrepMenuConfig.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Grep/GX_GrepMenuConfig.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -55,6 +55,7 @@ constructor Tf_GrepMenuConfig.Create(_Owner: TComponent); begin inherited; + TControl_SetMinConstraints(Self); InitDpiScaler; end; Modified: branches/dark-mode/Source/Grep/GX_GrepOptions.pas =================================================================== --- branches/dark-mode/Source/Grep/GX_GrepOptions.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Grep/GX_GrepOptions.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -64,6 +64,7 @@ begin inherited; + TControl_SetMinConstraints(Self); InitDpiScaler; end; Modified: branches/dark-mode/Source/Grep/GX_GrepResultsOptions.pas =================================================================== --- branches/dark-mode/Source/Grep/GX_GrepResultsOptions.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/Grep/GX_GrepResultsOptions.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -86,12 +86,16 @@ {$R *.dfm} -uses Graphics; +uses + Graphics, + u_dzVclUtils; constructor TfmGrepResultsOptions.Create(_Owner: TComponent); begin inherited; + TControl_SetMinConstraints(Self); + InitDpiScaler; end; Modified: branches/dark-mode/Source/MacroLibrary/GX_MacroLibraryConfig.pas =================================================================== --- branches/dark-mode/Source/MacroLibrary/GX_MacroLibraryConfig.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/MacroLibrary/GX_MacroLibraryConfig.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -14,6 +14,7 @@ private public class function Execute(_Owner: TWinControl; var APromptForName: Boolean): Boolean; + constructor Create(_Owner: TComponent); override; end; implementation @@ -25,6 +26,13 @@ { TfmGxMacroLibraryConfig } +constructor TfmGxMacroLibraryConfig.Create(_Owner: TComponent); +begin + inherited; + TControl_SetMinConstraints(Self); + InitDpiScaler; +end; + class function TfmGxMacroLibraryConfig.Execute(_Owner: TWinControl; var APromptForName: Boolean): Boolean; var frm: TfmGxMacroLibraryConfig; @@ -33,8 +41,7 @@ try TForm_CenterOn(frm, _Owner); frm.chk_AutoPrompt.Checked := APromptForName; - frm.InitDpiScaler; - Result := mrOk = frm.ShowModal; + Result := (mrOk = frm.ShowModal); if Result then APromptForName := frm.chk_AutoPrompt.Checked; finally Modified: branches/dark-mode/Source/MacroLibrary/GX_MacroLibraryEditEntry.pas =================================================================== --- branches/dark-mode/Source/MacroLibrary/GX_MacroLibraryEditEntry.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/MacroLibrary/GX_MacroLibraryEditEntry.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -74,6 +74,9 @@ Items: TStrings; begin inherited; + + TControl_SetMinConstraints(Self); + pnlEditGoesHere.BevelOuter := bvNone; FEdit := TSynEdit.Create(Self); FEdit.Parent := pnlEditGoesHere; Modified: branches/dark-mode/Source/MessageDialog/GX_MessageOptions.pas =================================================================== --- branches/dark-mode/Source/MessageDialog/GX_MessageOptions.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/MessageDialog/GX_MessageOptions.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -32,6 +32,7 @@ public class function Execute(_Owner: TWinControl; var _CrLfPascal: string; var _CrLfCPP: string; var _GunGetTextFunction: TGnuGetTextFunction; var _GnuGetTextIndividual: Boolean): Boolean; + constructor Create(_Owner: TComponent); override; end; implementation @@ -51,7 +52,6 @@ frm := TfmMessageOptions.Create(_Owner); try TForm_CenterOn(frm, _Owner); - frm.InitDpiScaler; frm.SetData(_CrLfPascal, _CrLfCPP, _GunGetTextFunction, _GnuGetTextIndividual); Result := (frm.ShowModal = mrOk); if Result then @@ -61,6 +61,13 @@ end; end; +constructor TfmMessageOptions.Create(_Owner: TComponent); +begin + inherited; + TControl_SetMinConstraints(Self); + InitDpiScaler; +end; + procedure TfmMessageOptions.GetData(out _CrLfPascal, _CrLfCPP: string; out _GunGetTextFunction: TGnuGetTextFunction; out _GnuGetTextIndividual: Boolean); begin Modified: branches/dark-mode/Source/ProcedureList/GX_ProcedureListOptions.pas =================================================================== --- branches/dark-mode/Source/ProcedureList/GX_ProcedureListOptions.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/ProcedureList/GX_ProcedureListOptions.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -80,7 +80,9 @@ {$R *.dfm} uses - SysUtils, Dialogs; + SysUtils, + Dialogs, + u_dzVclUtils; const CodeViewFontKey = 'CodeViewFont'; @@ -172,7 +174,7 @@ constructor TfmProcedureListOptions.Create(_Owner: TComponent); begin inherited; - + TControl_SetMinConstraints(Self); InitDpiScaler; end; Modified: branches/dark-mode/Source/ProjectDependencies/GX_ProjDependOptions.pas =================================================================== --- branches/dark-mode/Source/ProjectDependencies/GX_ProjDependOptions.pas 2024-06-06 15:40:57 UTC (rev 4262) +++ branches/dark-mode/Source/ProjectDependencies/GX_ProjDependOptions.pas 2024-06-09 16:07:34 UTC (rev 4263) @@ -31,6 +31,7 @@ public class function Execute(_Owner: TWinControl; var _ScanEntireUnit, _SearchLibraryPath, _SearchBrowsingPath: Boolean): Boolean; + constructor Create(_Owner: TComponent); override; end; implementation @@ -42,6 +43,13 @@ { TfmProjDependOptions } +constructor TfmProjDependOptions.Create(_Owner: TComponent); +begin + inherited; + TControl_SetMinConstraints(Self); + InitDpiScaler; +end; + class function TfmProjDependOptions.Execute(_Owner: TWinControl; var _ScanEntireUnit, _SearchLibraryPath, _SearchBrowsingPath: Boolean): Boolean; var This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |