Changeset 818 for trunk/dll/newview.c

Timestamp:

Aug 30, 2007, 12:40:11 AM (18 years ago)

Author:

Gregg Young

Message:

Reverse horizontal scroll bar behavior in fast internal viewer (no bar with word wrap & hex, bar present with unwrapped text) suppress duplicate error message on zero byte file load

File:

• trunk/dll/newview.c (modified) (4 diffs)

trunk/dll/newview.c

@@ -1795 +1795 @@
         else {
           WinSendMsg(hwnd, UM_SETUP5, MPVOID, MPVOID);
-          DosSleep(32); //05 Aug 07 GKY 32
+          DosSleep(16); //05 Aug 07 GKY 32
           return (MRESULT) 1;
         }
@@ -1867 +1867 @@
       BOOL invalidate = FALSE;
 
-      if (!ad->wrapon && !ad->hex) {
-        if (WinQueryWindow(ad->hhscroll, QW_PARENT) == ad->hwndFrame) {
-          invalidate = TRUE;
-          WinSetOwner(ad->hhscroll, HWND_OBJECT);
-          WinSetParent(ad->hhscroll, HWND_OBJECT, TRUE);
-          ad->maxx = 0;
-          ad->horzscroll = 0;
-        }
+      if (ad->wrapon || ad->hex) {
+        if (WinQueryWindow(ad->hhscroll, QW_PARENT) == ad->hwndFrame) {
+          invalidate = TRUE;
+          WinSetOwner(ad->hhscroll, HWND_OBJECT);
+          WinSetParent(ad->hhscroll, HWND_OBJECT, TRUE);
+          ad->maxx = 0;
+          ad->horzscroll = 0;
+        }
       }
       else {
@@ -3640 +3640 @@
             WinInvalidateRect(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                               NEWVIEW_DRAG), NULL, FALSE);
-            WinInvalidateRect(ad->hhscroll, NULL, FALSE);
+            //WinInvalidateRect(ad->hhscroll, NULL, FALSE);
           }
           DosReleaseMutexSem(ad->ScanSem);
@@ -3679 +3679 @@
             WinInvalidateRect(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                               NEWVIEW_DRAG), NULL, FALSE);
-            WinInvalidateRect(ad->hhscroll, NULL, FALSE);
+            //WinInvalidateRect(ad->hhscroll, NULL, FALSE);
           }
           DosReleaseMutexSem(ad->ScanSem);