Browse Source

* add window number and resize handle

pierre 23 years ago
parent
commit
07c6ace24c
2 changed files with 22 additions and 6 deletions
  1. 11 3
      fv/views.pas
  2. 11 3
      fvision/views.pas

+ 11 - 3
fv/views.pas

@@ -893,12 +893,12 @@ CONST
         e:=(length(SubStr)>0);
         e:=(length(SubStr)>0);
         while e and (i<=Length(s)-Length(SubStr)) do
         while e and (i<=Length(s)-Length(SubStr)) do
          begin
          begin
-           inc(i);
            if (SubStr[1]=s[i]) and (Substr=Copy(s,i,Length(SubStr))) then
            if (SubStr[1]=s[i]) and (Substr=Copy(s,i,Length(SubStr))) then
             begin
             begin
               j:=i;
               j:=i;
               e:=false;
               e:=false;
             end;
             end;
+           inc(i);
          end;
          end;
         PosIdx:=j;
         PosIdx:=j;
       end;
       end;
@@ -5427,7 +5427,11 @@ BEGIN
        OutTextXY(RawOrigin.X+RawSize.X-2*FontWidth-ViewPort.X1,
        OutTextXY(RawOrigin.X+RawSize.X-2*FontWidth-ViewPort.X1,
          RawOrigin.Y+Y+1-ViewPort.Y1+2, S);           { Write number }
          RawOrigin.Y+Y+1-ViewPort.Y1+2, S);           { Write number }
      End Else Begin                                   { LEON ????? }
      End Else Begin                                   { LEON ????? }
-       WriteStr(Size.X-5,0,S,2);
+       If (Flags and wfZoom)<>0 then
+         I:=7
+       else
+         I:=3;
+       WriteCStr(Size.X-I,0,S,1,3);
      End;
      End;
    End;
    End;
    If (Flags AND wfClose<>0) Then Begin               { Close icon request }
    If (Flags AND wfClose<>0) Then Begin               { Close icon request }
@@ -5451,6 +5455,7 @@ BEGIN
          RawOrigin.Y+Y+1-ViewPort.Y1+2, '['+C+']'); { Write zoom icon }
          RawOrigin.Y+Y+1-ViewPort.Y1+2, '['+C+']'); { Write zoom icon }
      End Else Begin                                   { LEON??? }
      End Else Begin                                   { LEON??? }
        WriteCStr(Size.X-5,0,'[~'+C+'~]', 2, 3);
        WriteCStr(Size.X-5,0,'[~'+C+'~]', 2, 3);
+       WriteCStr(Size.X-2,Size.Y-1,'~ÄÙ~',2, 3);
      End;
      End;
    End;
    End;
    If not TextModeGFV then
    If not TextModeGFV then
@@ -5553,7 +5558,10 @@ END.
 
 
 {
 {
  $Log$
  $Log$
- Revision 1.22  2002-05-23 10:27:12  pierre
+ Revision 1.23  2002-05-24 13:16:11  pierre
+  * add window number and resize handle
+
+ Revision 1.22  2002/05/23 10:27:12  pierre
   * avoid problems with shadows when moving or resizing a window
   * avoid problems with shadows when moving or resizing a window
 
 
  Revision 1.21  2002/05/23 09:06:01  pierre
  Revision 1.21  2002/05/23 09:06:01  pierre

+ 11 - 3
fvision/views.pas

@@ -893,12 +893,12 @@ CONST
         e:=(length(SubStr)>0);
         e:=(length(SubStr)>0);
         while e and (i<=Length(s)-Length(SubStr)) do
         while e and (i<=Length(s)-Length(SubStr)) do
          begin
          begin
-           inc(i);
            if (SubStr[1]=s[i]) and (Substr=Copy(s,i,Length(SubStr))) then
            if (SubStr[1]=s[i]) and (Substr=Copy(s,i,Length(SubStr))) then
             begin
             begin
               j:=i;
               j:=i;
               e:=false;
               e:=false;
             end;
             end;
+           inc(i);
          end;
          end;
         PosIdx:=j;
         PosIdx:=j;
       end;
       end;
@@ -5427,7 +5427,11 @@ BEGIN
        OutTextXY(RawOrigin.X+RawSize.X-2*FontWidth-ViewPort.X1,
        OutTextXY(RawOrigin.X+RawSize.X-2*FontWidth-ViewPort.X1,
          RawOrigin.Y+Y+1-ViewPort.Y1+2, S);           { Write number }
          RawOrigin.Y+Y+1-ViewPort.Y1+2, S);           { Write number }
      End Else Begin                                   { LEON ????? }
      End Else Begin                                   { LEON ????? }
-       WriteStr(Size.X-5,0,S,2);
+       If (Flags and wfZoom)<>0 then
+         I:=7
+       else
+         I:=3;
+       WriteCStr(Size.X-I,0,S,1,3);
      End;
      End;
    End;
    End;
    If (Flags AND wfClose<>0) Then Begin               { Close icon request }
    If (Flags AND wfClose<>0) Then Begin               { Close icon request }
@@ -5451,6 +5455,7 @@ BEGIN
          RawOrigin.Y+Y+1-ViewPort.Y1+2, '['+C+']'); { Write zoom icon }
          RawOrigin.Y+Y+1-ViewPort.Y1+2, '['+C+']'); { Write zoom icon }
      End Else Begin                                   { LEON??? }
      End Else Begin                                   { LEON??? }
        WriteCStr(Size.X-5,0,'[~'+C+'~]', 2, 3);
        WriteCStr(Size.X-5,0,'[~'+C+'~]', 2, 3);
+       WriteCStr(Size.X-2,Size.Y-1,'~ÄÙ~',2, 3);
      End;
      End;
    End;
    End;
    If not TextModeGFV then
    If not TextModeGFV then
@@ -5553,7 +5558,10 @@ END.
 
 
 {
 {
  $Log$
  $Log$
- Revision 1.22  2002-05-23 10:27:12  pierre
+ Revision 1.23  2002-05-24 13:16:11  pierre
+  * add window number and resize handle
+
+ Revision 1.22  2002/05/23 10:27:12  pierre
   * avoid problems with shadows when moving or resizing a window
   * avoid problems with shadows when moving or resizing a window
 
 
  Revision 1.21  2002/05/23 09:06:01  pierre
  Revision 1.21  2002/05/23 09:06:01  pierre