Changeset 796 for trunk/dll/misc.c

Timestamp:

Aug 22, 2007, 1:22:27 AM (18 years ago)

Author:

Gregg Young

Message:

Make subject column in dircnrs movable from one pane to the other; allow column to be sized truncating long subjects

File:

• trunk/dll/misc.c (modified) (1 diff)

trunk/dll/misc.c

@@ -516 +516 @@
     // Fill in column info for subjects
 
-    pfi = pfi->pNextFieldInfo;
-    pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
-    if (isCompCnr)
-      pfi->flData |= CFA_FIREADONLY;
-    pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
-    pfi->pTitleData = isCompCnr ? GetPString(IDS_STATUS) :
+    if (fSubjectInLeftPane) {
+      pfi = pfi->pNextFieldInfo;
+      pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
+      if (isCompCnr)
+        pfi->flData |= CFA_FIREADONLY;
+      pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
+      pfi->pTitleData = isCompCnr ? GetPString(IDS_STATUS) :
                                   GetPString(IDS_SUBJ);
-    pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
-
-    // Store the current pfi value as that will be used to indicate the
-    // last column in the lefthand container window (we have a splitbar)
-
-    pfiLastLeftCol = pfi;
+      pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
+      pfi->cxWidth = SubjectDisplayWidth;
+
+      // Store the current pfi value as that will be used to indicate the
+      // last column in the lefthand container window (we have a splitbar)
+
+      pfiLastLeftCol = pfi;
+    }
+    else {
+      // Store the current pfi value as that will be used to indicate the
+      // last column in the lefthand container window (we have a splitbar)
+
+      pfiLastLeftCol = pfi;
+      pfi = pfi->pNextFieldInfo;
+      pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
+      if (isCompCnr)
+        pfi->flData |= CFA_FIREADONLY;
+      pfi->flTitle = CFA_LEFT | CFA_FITITLEREADONLY;
+      pfi->pTitleData = isCompCnr ? GetPString(IDS_STATUS) :
+                                  GetPString(IDS_SUBJ);
+      pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
+      pfi->cxWidth = SubjectDisplayWidth;
+    }
 
     // Fill in column information for the file size