From b6c28ff62f4bfa71780b51eb6988e509f8db2c9b Mon Sep 17 00:00:00 2001
From: Duane Clark <dclark@akamail.com>
Date: Mon, 11 Mar 2002 05:02:11 +0000
Subject: [PATCH] Add support for report mode text justification.

---
 dlls/comctl32/listview.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index a948d701baf..7c60197cc97 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -272,6 +272,7 @@ static BOOL LISTVIEW_IsSelected(HWND hwnd, INT nItem);
 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 @@ static VOID LISTVIEW_DrawSubItem(HWND hwnd, HDC hdc, INT nItem, INT nSubItem,
   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 @@ static VOID LISTVIEW_DrawSubItem(HWND hwnd, HDC hdc, INT nItem, INT nSubItem,
   *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 @@ static VOID LISTVIEW_DrawSubItem(HWND hwnd, HDC hdc, INT nItem, INT nSubItem,
     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)