commit b6c28ff62f4bfa71780b51eb6988e509f8db2c9b
author Duane Clark <dclark@akamail.com> Mon Mar 11 05:02:11 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 11 05:02:11 2002 +0000
tree 4298f6fa3d5d18b58a249446666c5b9996dea1a5
parent 4a6b990ce8f2b0b9bc739c0a01b59f5917c8638f

Add support for report mode text justification.

dlls/comctl32/listview.c

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index a948d70..7c60197 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -272,6 +272,7 @@
 static VOID LISTVIEW_RemoveSelectionRange(HWND hwnd, INT lItem, INT uItem);
 static void LISTVIEW_FillBackground(HWND hwnd, HDC hdc, LPRECT rc);
 static void ListView_UpdateLargeItemLabelRect (HWND hwnd, const LISTVIEW_INFO* infoPtr, int nItem, RECT *rect);
+static LRESULT LISTVIEW_GetColumnT(HWND, INT, LPLVCOLUMNW, BOOL);
 
 /******** Defines that LISTVIEW_ProcessLetterKeys uses ****************/
 #define KEY_DELAY       450
@@ -3006,8 +3007,11 @@
   LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)GetWindowLongW(hwnd, 0); 
   WCHAR szDispText[DISP_TEXT_SIZE];
   LVITEMW lvItem;
+  LVCOLUMNW lvColumn;
   UINT textoutOptions = ETO_CLIPPED | ETO_OPAQUE;
   RECT rcTemp;
+  INT textLeft;
+  INT nLabelWidth = 0;
 
   TRACE("(hwnd=%x, hdc=%x, nItem=%d, nSubItem=%d)\n", hwnd, hdc,
         nItem, nSubItem);
@@ -3022,6 +3026,22 @@
   *lvItem.pszText = '\0';
   LISTVIEW_GetItemW(hwnd, &lvItem, TRUE);
   TRACE("   lvItem=%s\n", debuglvitem_t(&lvItem, TRUE));
+  
+  ZeroMemory(&lvColumn, sizeof(lvColumn));
+  lvColumn.mask = LVCF_FMT;
+  LISTVIEW_GetColumnT(hwnd, nSubItem, &lvColumn, TRUE);
+  textLeft = rcItem.left;
+  if (lvColumn.fmt != LVCFMT_LEFT)
+  {
+    if ((nLabelWidth = LISTVIEW_GetStringWidthT(hwnd, lvItem.pszText, TRUE)))
+    {
+      if (lvColumn.fmt == LVCFMT_RIGHT)
+        textLeft = rcItem.right - nLabelWidth;
+      else
+        textLeft = rcItem.left + (rcItem.right-rcItem.left-nLabelWidth)/2;
+    }
+  }
+    
 
   /* redraw the background of the item */
   rcTemp = rcItem;
@@ -3062,7 +3082,7 @@
     SetTextColor(hdc, infoPtr->clrText);
   }
 
-  ExtTextOutW(hdc, rcItem.left, rcItem.top, textoutOptions, 
+  ExtTextOutW(hdc, textLeft, rcItem.top, textoutOptions, 
               &rcItem, lvItem.pszText, lstrlenW(lvItem.pszText), NULL);
 
   if (Selected)