Index: vmenu.cpp
===================================================================
--- vmenu.cpp	(revision 3051)
+++ vmenu.cpp	(working copy)
@@ -444,7 +444,7 @@
   // ������� Top`�
   if(GetVisualPos(TopPos)+GetShowItemCount() >= Y2-Y1 && SelectPos == GetShowItemCount()-1)
   {
-    if (GetShowItemCount() == ItemCount)
+    if (GetShowItemCount() != ItemCount)
     {
       int i=TopPos;
       for (int v=0; i >0 && v < 1; i--)
@@ -529,7 +529,7 @@
   */
   if (VisualSelectPos > GetVisualPos(TopPos)+((BoxType!=NO_BOX)?Y2-Y1-2:Y2-Y1))
   {
-    if (GetShowItemCount() == ItemCount)
+    if (GetShowItemCount() != ItemCount)
     {
       int i=SelectPos;
       for (int v=0; i >0 && v < ((BoxType!=NO_BOX)?Y2-Y1-2:Y2-Y1); i--)
@@ -766,7 +766,7 @@
 {
   CriticalSectionLock Lock(CS);
 
-  return ((LastAddedItem>=TopPos && LastAddedItem<(TopPos+Y2-Y1)+2) || VMFlags.Check(VMENU_UPDATEREQUIRED));
+  return ((GetVisualPos(LastAddedItem)>=GetVisualPos(TopPos) && GetVisualPos(LastAddedItem)<(GetVisualPos(TopPos)+Y2-Y1)+2) || VMFlags.Check(VMENU_UPDATEREQUIRED));
 
   //+1 for real diff
   //+2 for scrollbar
@@ -1097,7 +1097,22 @@
        ! ����������� ��������� ������� �� PgUp/PgDn
          � ������������ ������ VMENU_SHOWNOBOX (NO_BOX)
       */
-      if((I=SelectPos-((BoxType!=NO_BOX)?Y2-Y1-1:Y2-Y1)) < 0)
+      int y=((BoxType!=NO_BOX)?Y2-Y1-1:Y2-Y1);
+      if (GetShowItemCount() != ItemCount)
+      {
+        int i=SelectPos;
+        for (int v=0; i >0 && v < y; i--)
+        {
+          if(!(Item[i]->Flags&LIF_HIDDEN))
+            v++;
+        }
+        I=i;
+      }
+      else
+      {
+        I=SelectPos-y;
+      }
+      if(I < 0)
         I=0;
       SelectPos=SetSelectPos(I,1);
       ShowMenu(TRUE);
@@ -1106,7 +1121,22 @@
 
     case KEY_PGDN:         case KEY_NUMPAD3:
     {
-      if((I=SelectPos+((BoxType!=NO_BOX)?Y2-Y1-1:Y2-Y1)) >= ItemCount)
+      int y=((BoxType!=NO_BOX)?Y2-Y1-1:Y2-Y1);
+      if (GetShowItemCount() != ItemCount)
+      {
+        int i=SelectPos;
+        for (int v=0; i < ItemCount && v < y; i++)
+        {
+          if(!(Item[i]->Flags&LIF_HIDDEN))
+            v++;
+        }
+        I=i;
+      }
+      else
+      {
+        I=SelectPos-y;
+      }
+      if(I >= ItemCount)
         I=ItemCount-1;
       SelectPos=SetSelectPos(I,-1);
       ShowMenu(TRUE);
@@ -1477,15 +1507,17 @@
 
   ItemCount-=Count;
 
-  if(SelectPos < TopPos || SelectPos > TopPos+Y2-Y1 || TopPos >= ItemCount)
+  RecalcItemHiddenCount();
+
+  if(GetVisualPos(SelectPos) < GetVisualPos(TopPos) || GetVisualPos(SelectPos) > GetVisualPos(TopPos)+Y2-Y1 || GetVisualPos(TopPos) >= GetShowItemCount())
   {
     TopPos=0;
     VMFlags.Set(VMENU_UPDATEREQUIRED);
   }
 
   // ����� �� ������� �����?
-  if ((ID >= TopPos && ID < TopPos+Y2-Y1) ||
-      (ID+Count >= TopPos && ID+Count < TopPos+Y2-Y1)) //???
+  if ((ID >= TopPos && GetVisualPos(ID) < GetVisualPos(TopPos)+Y2-Y1) ||
+      (ID+Count >= TopPos && GetVisualPos(ID+Count) < GetVisualPos(TopPos)+Y2-Y1)) //???
   {
     VMFlags.Set(VMENU_UPDATEREQUIRED);
   }
@@ -1499,7 +1531,6 @@
 			VMFlags.Set(VMENU_SELECTPOSNONE);
 	}
 
-  RecalcItemHiddenCount();
   return(ItemCount);
 }
 
@@ -1837,15 +1868,17 @@
     TopPos=ListPos->TopPos;
     if(ListPos->TopPos == -1)
     {
-      if(ItemCount < MaxHeight)
+      if(GetShowItemCount() < MaxHeight)
+      {
         TopPos=0;
+      }
       else
       {
 
         //TopPos=Ret-MaxHeight/2;               //?????????
-        TopPos = (ListPos->SelectPos-ListPos->TopPos+1) > MaxHeight?ListPos->TopPos+1:ListPos->TopPos;
-        if(TopPos+MaxHeight > ItemCount)
-          TopPos=ItemCount-MaxHeight;
+        TopPos = (GetVisualPos(ListPos->SelectPos)-GetVisualPos(ListPos->TopPos)+1) > MaxHeight?ListPos->TopPos+1:ListPos->TopPos;
+        if(GetVisualPos(TopPos)+MaxHeight > GetShowItemCount())
+          TopPos=GetShowItemCount()-MaxHeight;
 
       }
     }