Changeset 1525 for trunk/src/user32/scroll.cpp

Timestamp:

Oct 30, 1999, 8:40:49 PM (26 years ago)

Author:

cbratschi

Message:

button, static, scroll and dialog fixes

File:

• trunk/src/user32/scroll.cpp (modified) (8 diffs)

trunk/src/user32/scroll.cpp

@@ -1 @@
-/* $Id: scroll.cpp,v 1.16 1999-10-29 16:06:56 cbratschi Exp $ */
+/* $Id: scroll.cpp,v 1.17 1999-10-30 18:40:45 cbratschi Exp $ */
 /*
  * Scrollbar control
@@ -9 +9 @@
  *
  * WINE version: 990923
+ *
+ * Status:  complete
+ * Version: 5.00
  */
 
@@ -879 +882 @@
         if (msg == WM_LBUTTONUP)
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || !timerRunning)
+        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -900 +903 @@
         if (msg == WM_LBUTTONUP)
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || !timerRunning)
+        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -974 +977 @@
         if (msg == WM_LBUTTONUP)
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || !timerRunning)
+        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -998 +1001 @@
         if (msg == WM_LBUTTONUP)
           KillSystemTimer(hwnd,SCROLL_TIMER);
-        else if (msg == WM_LBUTTONDOWN || !timerRunning)
+        else if (msg == WM_LBUTTONDOWN || (!timerRunning && msg == WM_SYSTIMER))
         {
           SetSystemTimer( hwnd, SCROLL_TIMER, (msg == WM_LBUTTONDOWN) ?
@@ -1606 +1609 @@
     return TRUE;
 }
+
 /*************************************************************************
  *           EnableScrollBar   (USER32.171)
@@ -1677 +1681 @@
     }
   }
+
+  return TRUE;
+}
+
+//CB: not listed in user32.exp -> don't know the id!
+
+BOOL WINAPI GetScrollBarInfo(HWND hwnd,LONG idObject,PSCROLLBARINFO psbi)
+{
+  if (!psbi || psbi->cbSize != sizeof(SCROLLBARINFO))
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+
+    return FALSE;
+  }
+
+  HWND hwndScroll;
+  INT nBar,arrowSize;
+
+  switch (idObject)
+  {
+    case OBJID_CLIENT:
+      nBar = SB_CTL;
+      hwndScroll = hwnd;
+      break;
+
+    case OBJID_HSCROLL:
+      nBar = SB_HORZ;
+      hwndScroll = SCROLL_GetScrollHandle(hwnd,SB_HORZ);
+      break;
+
+    case OBJID_VSCROLL:
+      nBar = SB_VERT;
+      hwndScroll = SCROLL_GetScrollHandle(hwnd,SB_VERT);
+      break;
+
+    default:
+      return FALSE;
+  }
+
+  if (!hwndScroll) return FALSE;
+
+  SCROLL_GetScrollBarRect(hwndScroll,nBar,&psbi->rcScrollBar,&arrowSize,&psbi->dxyLineButton,&psbi->xyThumbTop);
+  psbi->xyThumbBottom = psbi->xyThumbTop+psbi->dxyLineButton;
+  psbi->bogus = 0; //CB: undocumented!
+  psbi->rgstate[0] = IsWindowVisible(hwndScroll) ? STATE_SYSTEM_INVISIBLE:0;
+  psbi->rgstate[1] = psbi->rgstate[2] = psbi->rgstate[3] = psbi->rgstate[4] = psbi->rgstate[5] = psbi->rgstate[0]; //CB: todo
 
   return TRUE;