Update of /cvsroot/pythianproject/Prototypes/GUISystem
In directory slayer.i.sourceforge.net:/tmp/cvs-serv22700/GUISystem
Modified Files:
StartupForm.pas vglStdCtrls.pas
Log Message:
added underlining to GLCanvas. fixed text bug. -mike
Index: StartupForm.pas
===================================================================
RCS file: /cvsroot/pythianproject/Prototypes/GUISystem/StartupForm.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** StartupForm.pas 2000/12/13 20:25:21 1.8
--- StartupForm.pas 2000/12/13 22:34:12 1.9
***************
*** 44,49 ****
procedure CB1OnChange(Sender:TObject);
-
-
procedure go;
end;
--- 44,47 ----
***************
*** 134,138 ****
Image1.Visible := not Image1.Visible;
if Image1.Visible then
! Button.Caption := 'hide image' else Button.Caption := 'show image';
end;
--- 132,143 ----
Image1.Visible := not Image1.Visible;
if Image1.Visible then
! begin
! Button.Caption := '|h|ide image';
! Button.HotKey := Ord('H');
! end else
! begin
! Button.Caption := '|s|how image';
! button.HotKey := Ord('S');
! end;
end;
***************
*** 191,201 ****
CB.Caption := 'This is a checkbox';
CB.OnChanged := CB1OnChange;
Button := TvglButton.Create('Button',Panel1);
! Button.Caption := 'hide image';
Button.Bounds := Rect(10,60,0,0);
Button.OnClick := ButtonOnClick;
! Button.Hotkey := Ord('B');
! Button.HotKeyShiftState := [vkmControl];
Button.HasHotkey := True;
--- 196,207 ----
CB.Caption := 'This is a checkbox';
CB.OnChanged := CB1OnChange;
+ CB.Text.FontName := 'VinerHand ITC';
Button := TvglButton.Create('Button',Panel1);
! Button.Caption := '|h|ide image';
Button.Bounds := Rect(10,60,0,0);
Button.OnClick := ButtonOnClick;
! Button.Hotkey := Ord('H');
! Button.HotKeyShiftState := [vkmAlt];
Button.HasHotkey := True;
***************
*** 242,245 ****
--- 248,252 ----
LB.Bounds := Rect(260, 30, 450, 280);
LB.ScrollBars := ssBoth;
+
InterfaceManager.SetNewFocus(LB);
Hide;
Index: vglStdCtrls.pas
===================================================================
RCS file: /cvsroot/pythianproject/Prototypes/GUISystem/vglStdCtrls.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** vglStdCtrls.pas 2000/12/13 20:25:21 1.3
--- vglStdCtrls.pas 2000/12/13 22:34:12 1.4
***************
*** 200,203 ****
--- 200,204 ----
property SelBgColor: TColor read FSelBgColor write SetSelBgColor;
property SelFgColor: TColor read FSelFgColor write SetSelFgColor;
+ property Text :TGLText read FGLText;
property Items: TStringList read FItems write SetItems;
***************
*** 243,246 ****
--- 244,248 ----
procedure DrawSelf(where:TRect); override ;
published
+ property Text :TGLText read FCaptionText;
property Checked: Boolean read FChecked write SetChecked default False;
property Color :TColor write SetColor;
***************
*** 318,321 ****
--- 320,325 ----
vglSB_TimerInterval = 100;
vglSB_TimerIntervalFirst = 500;
+
+ { TvglScrollbar }
vglLB_TimerInterval = 100;
vglLB_TimerIntervalFirst = 500;
***************
*** 328,332 ****
vglSB_InAccuracyMoveVert = 25;
-
function TvglScrollBar.CheckPart(X, Y: Integer): Integer;
var
--- 332,335 ----
***************
*** 832,836 ****
FItems := TStringList.Create;
FItems.OnChange := ItemsChanged;
- //FGLTexts := TStringList.Create;
FGLText := TGLText.Create('Arial');
FAcceptsChildren := False;
--- 835,838 ----
***************
*** 1319,1325 ****
SkinRect := GetCheckMarkSkinRect;
MarkRect := GetCheckMarkBounds(where);
if FCaptionText.Text <> '' then
Canvas.DrawText(where.Left + SkinRect.Right - SkinRect.Left + 5, where.Top, FCaptionText);
- Canvas.DrawBitmapSubRect(MarkRect.Left, MarkRect.Top, SkinRect, FImage);
FImage.Intensity := 255;
end;
--- 1321,1327 ----
SkinRect := GetCheckMarkSkinRect;
MarkRect := GetCheckMarkBounds(where);
+ Canvas.DrawBitmapSubRect(MarkRect.Left, MarkRect.Top, SkinRect, FImage);
if FCaptionText.Text <> '' then
Canvas.DrawText(where.Left + SkinRect.Right - SkinRect.Left + 5, where.Top, FCaptionText);
FImage.Intensity := 255;
end;
***************
*** 1409,1412 ****
--- 1411,1415 ----
begin
FImage := nil;
+ FCaptionText.Free;
inherited;
end;
|
