Menu
▾
▴
[JVCL-Checkins] CVS: jvcl/source JvToolEdit.pas,1.20,1.21 JvxCtrls.pas,1.17,1.18
|
From: Remko B. <rem...@us...> - 2003-04-20 12:42:59
|
Update of /cvsroot/jvcl/jvcl/source
In directory sc8-pr-cvs1:/tmp/cvs-serv31853
Modified Files:
JvToolEdit.pas JvxCtrls.pas
Log Message:
* Mantis #825
* COMPILER7_UP changed to JVCLThemesEnabled
Index: JvToolEdit.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvToolEdit.pas,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** JvToolEdit.pas 3 Apr 2003 07:48:50 -0000 1.20
--- JvToolEdit.pas 20 Apr 2003 12:42:56 -0000 1.21
***************
*** 21,25 ****
Rob den Braasem [rbr...@xs...]
Polaris Software
!
You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
located at http://jvcl.sourceforge.net
--- 21,26 ----
Rob den Braasem [rbr...@xs...]
Polaris Software
! rblaurindo
!
You may retrieve the latest version of this file at the Project JEDI's JVCL home page,
located at http://jvcl.sourceforge.net
***************
*** 88,97 ****
procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
X, Y: Integer); override;
- {$IFDEF WIN32}
procedure Paint; override;
- {$ENDIF WIN32}
public
// (rom) renamed from FStandart
FStandard: Boolean; // Polaris
constructor Create(AOwner: TComponent); override;
procedure Click; override;
--- 89,99 ----
procedure MouseDown(Button: TMouseButton; Shift: TShiftState;
X, Y: Integer); override;
procedure Paint; override;
public
// (rom) renamed from FStandart
FStandard: Boolean; // Polaris
+ {$IFDEF JVCLThemesEnabled}
+ FDrawThemedDropDownBtn: Boolean;
+ {$ENDIF}
constructor Create(AOwner: TComponent); override;
procedure Click; override;
***************
*** 723,727 ****
property GlyphKind default gkDefault;
property PopupColor: TColor read GetPopupColor write SetPopupColor
! default clBtnFace;
property CalendarStyle: TCalendarStyle read GetCalendarStyle
write SetCalendarStyle default dcsDefault;
--- 725,729 ----
property GlyphKind default gkDefault;
property PopupColor: TColor read GetPopupColor write SetPopupColor
! default clMenu;
property CalendarStyle: TCalendarStyle read GetCalendarStyle
write SetCalendarStyle default dcsDefault;
***************
*** 870,874 ****
uses
ShellAPI, Consts, Math,
! {$IFDEF COMPILER7_UP}
Themes,
{$ENDIF}
--- 872,876 ----
uses
ShellAPI, Consts, Math,
! {$IFDEF JVCLThemesEnabled}
Themes,
{$ENDIF}
***************
*** 876,880 ****
ExtDlgs,
{$ENDIF}
! JvxRConst, JvVCLUtils, JvStrUtils, JvFileUtil, JvPickDate;
{$IFDEF WIN32}
--- 878,882 ----
ExtDlgs,
{$ENDIF}
! JvxRConst, JvVCLUtils, JvStrUtils, JvFileUtil, JvPickDate, JvBrowseFolder;
{$IFDEF WIN32}
***************
*** 948,954 ****
ExStyle: DWORD;
const
! AlignStyle: array[Boolean, TAlignment] of DWORD =
! ((WS_EX_LEFT, WS_EX_RIGHT, WS_EX_LEFT),
! (WS_EX_RIGHT, WS_EX_LEFT, WS_EX_LEFT));
{$ENDIF}
begin
--- 950,956 ----
ExStyle: DWORD;
const
! AlignStyle: array [Boolean, TAlignment] of DWORD =
! ((WS_EX_LEFT, WS_EX_RIGHT, WS_EX_LEFT),
! (WS_EX_RIGHT, WS_EX_LEFT, WS_EX_LEFT));
{$ENDIF}
begin
***************
*** 1068,1093 ****
end;
- {$IFDEF WIN32}
-
procedure TJvEditButton.Paint;
begin
! inherited Paint;
! {$IFNDEF COMPILER7_UP}
! if FState <> rbsDown then
! with Canvas do
begin
! if NewStyleControls then
! Pen.Color := clBtnFace
else
! Pen.Color := clBtnShadow;
! MoveTo(0, 0);
! LineTo(0, Self.Height - 1);
! Pen.Color := clBtnHighlight;
! MoveTo(1, 1);
! LineTo(1, Self.Height - 2);
! end;
! {$ENDIF COMPILER7_UP}
end;
- {$ENDIF WIN32}
procedure TJvEditButton.MouseDown(Button: TMouseButton; Shift: TShiftState;
--- 1070,1122 ----
end;
procedure TJvEditButton.Paint;
+ {$IFDEF JVCLThemesEnabled}
+ var
+ ThemedState: TThemedComboBox;
+ Details: TThemedElementDetails;
+ R: TRect;
+ {$ENDIF}
begin
! {$IFDEF JVCLThemesEnabled}
! if ThemeServices.ThemesEnabled then
! begin
! if FDrawThemedDropDownBtn then
begin
! if not Enabled then
! ThemedState := tcDropDownButtonDisabled
else
! if FState = rbsDown then
! ThemedState := tcDropDownButtonPressed
! else
! if MouseInControl then
! ThemedState := tcDropDownButtonHot
! else
! ThemedState := tcDropDownButtonNormal;
! R := BoundsRect;
! Details := ThemeServices.GetElementDetails(ThemedState);
! ThemeServices.DrawElement(Canvas.Handle, Details, R);
! end
! else
! inherited Paint;
! end
! else
! {$ENDIF}
! begin
! inherited Paint;
! if FState <> rbsDown then
! with Canvas do
! begin
! if NewStyleControls then
! Pen.Color := clBtnFace
! else
! Pen.Color := clBtnShadow;
! MoveTo(0, 0);
! LineTo(0, Self.Height - 1);
! Pen.Color := clBtnHighlight;
! MoveTo(1, 1);
! LineTo(1, Self.Height - 2);
! end;
! end;
end;
procedure TJvEditButton.MouseDown(Button: TMouseButton; Shift: TShiftState;
***************
*** 1397,1401 ****
procedure TJvCustomComboEdit.CreateParams(var Params: TCreateParams);
const
! Alignments: array[TAlignment] of Longword = (ES_LEFT, ES_RIGHT, ES_CENTER);
begin
inherited CreateParams(Params);
--- 1426,1430 ----
procedure TJvCustomComboEdit.CreateParams(var Params: TCreateParams);
const
! Alignments: array [TAlignment] of Longword = (ES_LEFT, ES_RIGHT, ES_CENTER);
begin
inherited CreateParams(Params);
***************
*** 1727,1730 ****
--- 1756,1767 ----
begin
FButton.Flat := Value;
+ {$IFDEF JVCLThemesEnabled}
+ { When XP Themes are enabled, ButtonFlat = False, GlyphKind = gkDropDown then
+ the glyph is the default themed dropdown button. When ButtonFlat = True, we
+ can't use that default dropdown button, so we have to recreate the glyph
+ in this special case }
+ if ThemeServices.ThemesEnabled and (GlyphKind = gkDropDown) then
+ RecreateGlyph;
+ {$ENDIF}
end;
***************
*** 1761,1765 ****
begin
AdjustHeight;
! {$IFDEF COMPILER7_UP}
{ If flat and themes are enabled, move the left edge of the edit rectangle
to the right, otherwise the theme edge paints over the border }
--- 1798,1802 ----
begin
AdjustHeight;
! {$IFDEF JVCLThemesEnabled}
{ If flat and themes are enabled, move the left edge of the edit rectangle
to the right, otherwise the theme edge paints over the border }
***************
*** 1767,1771 ****
LLeft := 3
else
! {$ENDIF}
LLeft := 0;
SetRect(Loc, LLeft, 0, ClientWidth - FBtnControl.Width {Polaris - 2}, ClientHeight + 1);
--- 1804,1808 ----
LLeft := 3
else
! {$ENDIF}
LLeft := 0;
SetRect(Loc, LLeft, 0, ClientWidth - FBtnControl.Width {Polaris - 2}, ClientHeight + 1);
***************
*** 1781,1785 ****
{$IFDEF WIN32}
if NewStyleControls then
! {$IFDEF COMPILER7_UP}
if ThemeServices.ThemesEnabled then
begin
--- 1818,1822 ----
{$IFDEF WIN32}
if NewStyleControls then
! {$IFDEF JVCLThemesEnabled}
if ThemeServices.ThemesEnabled then
begin
***************
*** 1793,1797 ****
end
else
! {$ENDIF}
begin
if Ctl3D and (BorderStyle = bsSingle) then
--- 1830,1834 ----
end
else
! {$ENDIF JVCLThemesEnabled}
begin
if Ctl3D and (BorderStyle = bsSingle) then
***************
*** 1812,1816 ****
{$ELSE}
BtnRect := Bounds(Width - FButton.Width, 0, FButton.Width, Height);
! {$ENDIF}
with BtnRect do
FBtnControl.SetBounds(Left, Top, Right - Left, Bottom - Top);
--- 1849,1853 ----
{$ELSE}
BtnRect := Bounds(Width - FButton.Width, 0, FButton.Width, Height);
! {$ENDIF WIN32}
with BtnRect do
FBtnControl.SetBounds(Left, Top, Right - Left, Bottom - Top);
***************
*** 1993,1997 ****
procedure TJvCustomComboEdit.SetShowCaret;
const
! CaretWidth: array[Boolean] of Byte = (1, 2);
begin
CreateCaret(Handle, 0, CaretWidth[fsBold in Font.Style], GetTextHeight);
--- 2030,2034 ----
procedure TJvCustomComboEdit.SetShowCaret;
const
! CaretWidth: array [Boolean] of Byte = (1, 2);
begin
CreateCaret(Handle, 0, CaretWidth[fsBold in Font.Style], GetTextHeight);
***************
*** 2152,2155 ****
--- 2189,2201 ----
begin
+ {$IFDEF JVCLThemesEnabled}
+ { When XP Themes are enabled, ButtonFlat = False, GlyphKind = gkDropDown then
+ the glyph is the default themed dropdown button. When ButtonFlat = True, we
+ can't use that default dropdown button (because we then use toolbar buttons,
+ and there is no themed dropdown toolbar button) }
+ if ThemeServices.ThemesEnabled then
+ FButton.FDrawThemedDropDownBtn := (FGlyphKind = gkDropDown) and not ButtonFlat;
+ {$ENDIF}
+
case FGlyphKind of
gkDefault:
***************
*** 2166,2169 ****
--- 2212,2218 ----
end;
gkDropDown:
+ {$IFDEF JVCLThemesEnabled}
+ if ButtonFlat or not ThemeServices.ThemesEnabled then
+ {$ENDIF}
begin
FButton.Glyph.Handle := LoadBitmap(0, PChar(32738));
***************
*** 2272,2276 ****
procedure TJvFileDirEdit.WMDropFiles(var Msg: TWMDropFiles);
var
! AFileName: array[0..255] of Char;
I, Num: Cardinal;
begin
--- 2321,2325 ----
procedure TJvFileDirEdit.WMDropFiles(var Msg: TWMDropFiles);
var
! AFileName: array [0..255] of Char;
I, Num: Cardinal;
begin
***************
*** 2602,2613 ****
DisableSysErrors;
try
- {$IFDEF WIN32}
if NewStyleControls and (DialogKind = dkWin32) then
! Action := BrowseDirectory(Temp, FDialogText, Self.HelpContext)
else
Action := SelectDirectory(Temp, FOptions, Self.HelpContext);
- {$ELSE}
- Action := SelectDirectory(Temp, FOptions, Self.HelpContext);
- {$ENDIF}
finally
EnableSysErrors;
--- 2651,2659 ----
DisableSysErrors;
try
if NewStyleControls and (DialogKind = dkWin32) then
! Action := BrowseForFolder(FDialogText, True, Temp, Self.HelpContext)
! //BrowseDirectory(Temp, FDialogText, Self.HelpContext)
else
Action := SelectDirectory(Temp, FOptions, Self.HelpContext);
finally
EnableSysErrors;
***************
*** 2708,2712 ****
FBlanksChar := ' ';
FTitle := SDateDlgTitle;
! FPopupColor := clBtnFace;
FDefNumGlyphs := 2;
FStartOfWeek := Mon;
--- 2754,2758 ----
FBlanksChar := ' ';
FTitle := SDateDlgTitle;
! FPopupColor := clMenu;
FDefNumGlyphs := 2;
FStartOfWeek := Mon;
Index: JvxCtrls.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvxCtrls.pas,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** JvxCtrls.pas 13 Apr 2003 13:14:02 -0000 1.17
--- JvxCtrls.pas 20 Apr 2003 12:42:56 -0000 1.18
***************
*** 796,799 ****
--- 796,800 ----
procedure Click; override;
procedure UpdateTracking;
+ property MouseInControl: Boolean read FMouseInControl;
published
property FlatStandard: Boolean read FFlatStandard write SetFlatStandard default False;
***************
*** 967,971 ****
ImgList, ActnList,
{$ENDIF}
! {$IFDEF COMPILER7_UP}
Themes,
{$ENDIF}
--- 968,972 ----
ImgList, ActnList,
{$ENDIF}
! {$IFDEF JVCLThemesEnabled}
Themes,
{$ENDIF}
***************
*** 4996,5000 ****
PaintRect: TRect;
AState: TJvButtonState;
! {$IFDEF COMPILER7_UP}
Button: TThemedButton;
ToolButton: TThemedToolBar;
--- 4997,5001 ----
PaintRect: TRect;
AState: TJvButtonState;
! {$IFDEF JVCLThemesEnabled}
Button: TThemedButton;
ToolButton: TThemedToolBar;
***************
*** 5017,5021 ****
AState := rbsInactive;
! {$IFDEF COMPILER7_UP}
if ThemeServices.ThemesEnabled then
begin
--- 5018,5022 ----
AState := rbsInactive;
! {$IFDEF JVCLThemesEnabled}
if ThemeServices.ThemesEnabled then
begin
***************
*** 5072,5076 ****
end
else
! {$ENDIF COMPILER7_UP}
begin
PaintRect := Rect(0, 0, Width, Height);
--- 5073,5077 ----
end
else
! {$ENDIF JVCLThemesEnabled}
begin
PaintRect := Rect(0, 0, Width, Height);
***************
*** 5648,5655 ****
procedure TJvSpeedButton.CMMouseEnter(var Msg: TMessage);
! {$IFDEF COMPILER7_UP}
var
NeedRepaint: Boolean;
! {$ENDIF}
begin
inherited;
--- 5649,5656 ----
procedure TJvSpeedButton.CMMouseEnter(var Msg: TMessage);
! {$IFDEF JVCLThemesEnabled}
var
NeedRepaint: Boolean;
! {$ENDIF}
begin
inherited;
***************
*** 5674,5678 ****
end;
! {$IFDEF COMPILER7_UP}
{ Don't draw a border if DragMode <> dmAutomatic since this button is meant to
be used as a dock client. }
--- 5675,5679 ----
end;
! {$IFDEF JVCLThemesEnabled}
{ Don't draw a border if DragMode <> dmAutomatic since this button is meant to
be used as a dock client. }
***************
*** 5688,5692 ****
end;
{$ELSE}
! if (not FMouseInControl) and Enabled and IsForegroundTask then
begin
FMouseInControl := True;
--- 5689,5693 ----
end;
{$ELSE}
! if not FMouseInControl and Enabled and IsForegroundTask then
begin
FMouseInControl := True;
***************
*** 5695,5706 ****
MouseEnter;
end;
! {$ENDIF COMPILER7_UP}
end;
procedure TJvSpeedButton.CMMouseLeave(var Msg: TMessage);
! {$IFDEF COMPILER7_UP}
var
NeedRepaint: Boolean;
! {$ENDIF}
begin
inherited;
--- 5696,5707 ----
MouseEnter;
end;
! {$ENDIF JVCLThemesEnabled}
end;
procedure TJvSpeedButton.CMMouseLeave(var Msg: TMessage);
! {$IFDEF JVCLThemesEnabled}
var
NeedRepaint: Boolean;
! {$ENDIF}
begin
inherited;
***************
*** 5717,5721 ****
FOver := False;
end;
! {$IFDEF COMPILER7_UP}
NeedRepaint := FFlat and FMouseInControl and Enabled and not FDragging;
{ Windows XP introduced hot states also for non-flat buttons. }
--- 5718,5722 ----
FOver := False;
end;
! {$IFDEF JVCLThemesEnabled}
NeedRepaint := FFlat and FMouseInControl and Enabled and not FDragging;
{ Windows XP introduced hot states also for non-flat buttons. }
***************
*** 5734,5738 ****
MouseLeave;
end;
! {$ENDIF COMPILER7_UP}
end;
--- 5735,5739 ----
MouseLeave;
end;
! {$ENDIF JVCLThemesEnabled}
end;
|