redraw of twindow fixed

This commit is contained in:
peter 2004-11-04 23:58:39 +00:00
parent 050e8a3acc
commit 939bbef317

View File

@ -647,6 +647,7 @@ TYPE
PROCEDURE Close; Virtual; PROCEDURE Close; Virtual;
PROCEDURE InitFrame; Virtual; PROCEDURE InitFrame; Virtual;
PROCEDURE DrawBorder; Virtual; PROCEDURE DrawBorder; Virtual;
PROCEDURE ReDraw; Virtual;
PROCEDURE SetState (AState: Word; Enable: Boolean); Virtual; PROCEDURE SetState (AState: Word; Enable: Boolean); Virtual;
PROCEDURE Store (Var S: TStream); PROCEDURE Store (Var S: TStream);
PROCEDURE HandleEvent (Var Event: TEvent); Virtual; PROCEDURE HandleEvent (Var Event: TEvent); Virtual;
@ -1407,7 +1408,6 @@ BEGIN
{ OR Assigned(LimitsLocked) } { OR Assigned(LimitsLocked) }
Then Begin { Treat as a full redraw } Then Begin { Treat as a full redraw }
DrawBackGround; { Draw background } DrawBackGround; { Draw background }
Draw; { Draw interior }
If (GOptions AND goDrawFocus <> 0) Then If (GOptions AND goDrawFocus <> 0) Then
DrawFocus; { Draw focus } DrawFocus; { Draw focus }
If (Options AND ofFramed <> 0) OR If (Options AND ofFramed <> 0) OR
@ -1416,17 +1416,13 @@ BEGIN
If ((State AND sfShadow) <> 0) AND If ((State AND sfShadow) <> 0) AND
(GOptions And goNoShadow = 0) Then (GOptions And goNoShadow = 0) Then
DrawShadow; DrawShadow;
Draw; { Draw interior }
End Else Begin { Masked draws only } End Else Begin { Masked draws only }
If (DrawMask AND vdBackGnd <> 0) Then { Chk background mask } If (DrawMask AND vdBackGnd <> 0) Then { Chk background mask }
Begin Begin
DrawMask := DrawMask and Not vdBackGnd; DrawMask := DrawMask and Not vdBackGnd;
DrawBackGround; { Draw background } DrawBackGround; { Draw background }
end; end;
If (DrawMask AND vdInner <> 0) Then { Check Inner mask }
Begin
DrawMask := DrawMask and Not vdInner;
Draw; { Draw interior }
End;
If (DrawMask AND vdFocus <> 0) If (DrawMask AND vdFocus <> 0)
AND (GOptions AND goDrawFocus <> 0) then AND (GOptions AND goDrawFocus <> 0) then
Begin Begin
@ -1438,6 +1434,11 @@ BEGIN
DrawMask := DrawMask and Not vdBorder; DrawMask := DrawMask and Not vdBorder;
DrawBorder; { Draw border } DrawBorder; { Draw border }
End; End;
If (DrawMask AND vdInner <> 0) Then { Check Inner mask }
Begin
DrawMask := DrawMask and Not vdInner;
Draw; { Draw interior }
End;
If ((State AND sfShadow) <> 0) AND If ((State AND sfShadow) <> 0) AND
(DrawMask AND vdShadow <> 0) AND (DrawMask AND vdShadow <> 0) AND
(GOptions And goNoShadow = 0) AND (GOptions And goNoShadow = 0) AND
@ -5126,6 +5127,13 @@ BEGIN
END; END;
PROCEDURE TWindow.Redraw;
BEGIN
DrawView;
inherited Redraw;
END;
{***************************************************************************} {***************************************************************************}
{ INTERFACE ROUTINES } { INTERFACE ROUTINES }
{***************************************************************************} {***************************************************************************}
@ -5216,7 +5224,10 @@ END.
{ {
$Log$ $Log$
Revision 1.45 2004-11-03 20:51:36 florian Revision 1.46 2004-11-04 23:58:39 peter
redraw of twindow fixed
Revision 1.45 2004/11/03 20:51:36 florian
* fixed problems on targets requiring proper alignment * fixed problems on targets requiring proper alignment
Revision 1.44 2004/11/03 20:33:05 peter Revision 1.44 2004/11/03 20:33:05 peter