Menu
▾
▴
[GExperts-Checkins] SF.net SVN: gexperts:[4296] branches/dark-mode
|
From: <aka...@us...> - 2024-08-18 16:38:53
|
Revision: 4296
http://sourceforge.net/p/gexperts/code/4296
Author: akalwahome
Date: 2024-08-18 16:38:51 +0000 (Sun, 18 Aug 2024)
Log Message:
-----------
make code compile with Delphi 2007
Modified Paths:
--------------
branches/dark-mode/Projects/Delphi2007/GExpertsDelphi2007.dpr
branches/dark-mode/Source/Grep/GX_GrepResults.dfm
branches/dark-mode/Source/Grep/GX_GrepResults.pas
branches/dark-mode/Source/Grep/GX_GrepSearch.pas
branches/dark-mode/Source/Utils/GX_CheckButton.pas
Modified: branches/dark-mode/Projects/Delphi2007/GExpertsDelphi2007.dpr
===================================================================
--- branches/dark-mode/Projects/Delphi2007/GExpertsDelphi2007.dpr 2024-08-15 07:41:13 UTC (rev 4295)
+++ branches/dark-mode/Projects/Delphi2007/GExpertsDelphi2007.dpr 2024-08-18 16:38:51 UTC (rev 4296)
@@ -18,6 +18,7 @@
GX_BaseForm in '..\..\source\Framework\GX_BaseForm.pas' {fmBaseForm},
GX_BookmarkList in '..\..\source\Utils\GX_BookmarkList.pas',
GX_Bookmarks in '..\..\source\Bookmarks\GX_Bookmarks.pas' {fmGxBookmarksForm},
+ GX_CheckButton in '..\..\Source\Utils\GX_CheckButton.pas',
GX_CheckListBoxWithHints in '..\..\Source\ProjectOptionSets\GX_CheckListBoxWithHints.pas',
GX_ClassBrowser in '..\..\source\ClassBrowser\GX_ClassBrowser.pas' {fmClassBrowser},
GX_ClassHacks in '..\..\source\Framework\GX_ClassHacks.pas',
Modified: branches/dark-mode/Source/Grep/GX_GrepResults.dfm
===================================================================
--- branches/dark-mode/Source/Grep/GX_GrepResults.dfm 2024-08-15 07:41:13 UTC (rev 4295)
+++ branches/dark-mode/Source/Grep/GX_GrepResults.dfm 2024-08-18 16:38:51 UTC (rev 4296)
@@ -9,6 +9,7 @@
KeyPreview = True
OldCreateOrder = False
ShowHint = True
+ OnActivate = FormActivate
OnKeyPress = FormKeyPress
OnResize = FormResize
OnShow = FormShow
Modified: branches/dark-mode/Source/Grep/GX_GrepResults.pas
===================================================================
--- branches/dark-mode/Source/Grep/GX_GrepResults.pas 2024-08-15 07:41:13 UTC (rev 4295)
+++ branches/dark-mode/Source/Grep/GX_GrepResults.pas 2024-08-18 16:38:51 UTC (rev 4296)
@@ -326,6 +326,7 @@
procedure SplitterHistoryListCanResize(Sender: TObject; var NewSize: Integer; var Accept: Boolean);
procedure actHistoryClearExecute(Sender: TObject);
procedure actFileOptionsStandAloneExecute(Sender: TObject);
+ procedure FormActivate(Sender: TObject);
private
FLastRepaintTick: DWORD;
FSearchInProgress: Boolean;
@@ -360,6 +361,7 @@
FSaveSortCaption: string;
FSavedFormCaption: string;
FlbHistoryListIndexForHistoryMenuActions: Integer;
+ procedure InitThemedColors;
procedure SetStayOnTop(Value: Boolean);
procedure RefreshContextLines;
procedure SetShowContext(Value: Boolean);
@@ -545,6 +547,19 @@
{ TfmGrepResults }
+procedure TfmGrepResults.FormActivate(Sender: TObject);
+// will be called by the IDE if the form is in the saved layout.
+begin
+ inherited;
+ InitThemedColors;
+
+ AssignSettingsToForm;
+ ResizeListBox;
+ ResizeStatusBar;
+
+ ForceRedraw;
+end;
+
procedure TfmGrepResults.FormKeyPress(Sender: TObject; var Key: Char);
begin
if Key = #27 then
@@ -895,6 +910,29 @@
lbResults.Refresh;
end;
+procedure TfmGrepResults.InitThemedColors;
+var
+ LBackColor : TColor;
+begin
+{$IFDEF GX_SUPPORTS_THEMING}
+ if IsThemingEnabled then begin
+ InitTheming(Self);
+ GxOtaGetIDEThemingServices.ApplyTheme(tcHistoryListPage);
+
+ LBackColor := GetThemedColor(clWindow);
+
+ tcHistoryListPage.Style := tsFlatButtons; // don't paint the control themed
+ tcHistoryListPage.Brush.Color := LBackColor;
+
+ pnlMain.Color := LBackColor;
+ pnlBottom.Color := LBackColor;
+ lbResults.Color := LBackColor;
+ lbHistoryList.Color := LBackColor;
+ reContext.Color := LBackColor;
+ end;
+{$ENDIF}
+end;
+
procedure TfmGrepResults.InitGrepSettings(AGrepSettings: TGrepSettings);
begin
FGrepSettings := AGrepSettings;
@@ -2030,24 +2068,48 @@
lbHistoryList.Refresh;
end;
-procedure TfmGrepResults.FormShow(Sender: TObject);
+(*
+procedure TfmGrepResults.TabControlDrawTab(Control: TCustomTabControl; TabIndex: Integer; const Rect: TRect; Active: Boolean);
var
+ LCaption : string;
+ LTextRect : TRect;
LBackColor : TColor;
+ LTextColor : TColor;
begin
+ LCaption := TTabControl(Control).Tabs[TabIndex];
+ if Active then
+ begin
+ LBackColor := GetThemedColor(clHighlight);
+ LTextColor := GetThemedColor(clHighlightText)
+ end
+ else begin
+ LBackColor := GetThemedColor(clBtnFace);
+ LTextColor := GetThemedColor(clBtnText);
+ end;
+
+ Control.Canvas.Brush.Color := LBackColor;
+ Control.Canvas.FillRect(Rect);
+ Control.Canvas.Font.Color := LTextColor;
+
+ LTextRect := Rect;
+ LTextRect.Inflate(-3, -3);
+ DrawText(Control.Canvas.Handle, PChar(LCaption), -1, LTextRect, DT_TOP or DT_LEFT);
+end;
+*)
+
+type
+ TWinControlAccess = class(TWinControl);
+
+procedure TfmGrepResults.FormShow(Sender: TObject);
+begin
inherited;
+ InitThemedColors;
+
AssignSettingsToForm;
ResizeListBox;
ResizeStatusBar;
- if IsThemingEnabled then begin
- InitTheming(Self);
- LBackColor := GetThemedColor(clWindow);
- pnlMain.Color := LBackColor;
- pnlBottom.Color := LBackColor;
- lbResults.Color := LBackColor;
- lbHistoryList.Color := LBackColor;
- reContext.Color := LBackColor;
- end;
+
ForceRedraw;
end;
Modified: branches/dark-mode/Source/Grep/GX_GrepSearch.pas
===================================================================
--- branches/dark-mode/Source/Grep/GX_GrepSearch.pas 2024-08-15 07:41:13 UTC (rev 4295)
+++ branches/dark-mode/Source/Grep/GX_GrepSearch.pas 2024-08-18 16:38:51 UTC (rev 4296)
@@ -811,8 +811,10 @@
inherited;
TControl_SetConstraints(Self, [ccMinWidth, ccMinHeight, ccMaxHeight]);
+{$IFDEF GX_SUPPORTS_THEMING}
if not IsStandAlone then
InitTheming;
+{$ENDIF}
FixComboBoxSelections(Self);
end;
Modified: branches/dark-mode/Source/Utils/GX_CheckButton.pas
===================================================================
--- branches/dark-mode/Source/Utils/GX_CheckButton.pas 2024-08-15 07:41:13 UTC (rev 4295)
+++ branches/dark-mode/Source/Utils/GX_CheckButton.pas 2024-08-18 16:38:51 UTC (rev 4296)
@@ -22,8 +22,10 @@
private
FSavedOnClick: TNotifyEvent;
FData: Pointer;
+{$IFDEF GX_SUPPORTS_THEMING}
class constructor Create;
class destructor Destroy;
+{$ENDIF}
function GetDownState: Boolean;
procedure SetDownState(const Value: Boolean);
protected
@@ -71,6 +73,7 @@
GX_IdeUtils
;
+{$IFDEF GX_SUPPORTS_THEMING}
type
TGXCheckButtonStyleHook = class(TButtonStyleHook)
protected
@@ -154,6 +157,7 @@
end;
end;
end;
+{$ENDIF}
{ TGXCheckButton }
@@ -160,6 +164,7 @@
type
TWinControlAccess = class(TWinControl);
+{$IFDEF GX_SUPPORTS_THEMING}
class constructor TGXCheckButton.Create;
begin
TCustomStyleEngine.UnRegisterStyleHook(TGXCheckButton, TCheckBoxStyleHook);
@@ -170,6 +175,7 @@
begin
TCustomStyleEngine.UnRegisterStyleHook(TGXCheckButton, TGXCheckButtonStyleHook);
end;
+{$ENDIF}
constructor TGXCheckButton.Clone(var AControl);
var
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|