Nikolay Sivov : user32/listbox: Remove duplicated condition.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: db869b61a1a07421a40b65ee825e2cc7130009e1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=db869b61a1a07421a40b65ee8...

Author: Nikolay Sivov 
Date:   Mon Dec  3 13:32:08 2018 +0300

user32/listbox: Remove duplicated condition.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/user32/listbox.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index 6dbf8d9..6a33f81 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -515,8 +515,8 @@ static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y )
 static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, 
    		       INT index, UINT action, BOOL ignoreFocus )
 {
+    BOOL selected = FALSE, focused;
     LB_ITEMDATA *item = NULL;
-    BOOL selected = FALSE;

if (index < descr->nb_items)
     {
@@ -524,6 +524,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect,
         selected = is_item_selected(descr, index);
     }

+    focused = !ignoreFocus && descr->focus_item == index && descr->caret_on && descr->in_focus;
+
     if (IS_OWNERDRAW(descr))
     {
         DRAWITEMSTRUCT dis;
@@ -555,9 +557,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect,
         dis.itemState    = 0;
         if (selected)
             dis.itemState |= ODS_SELECTED;
-        if (!ignoreFocus && (descr->focus_item == index) &&
-            (descr->caret_on) &&
-            (descr->in_focus)) dis.itemState |= ODS_FOCUS;
+        if (focused)
+            dis.itemState |= ODS_FOCUS;
         if (!IsWindowEnabled(descr->self)) dis.itemState |= ODS_DISABLED;
         dis.itemData     = item->data;
         dis.rcItem       = *rect;
@@ -607,9 +608,8 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect,
             SetBkColor( hdc, oldBk );
             SetTextColor( hdc, oldText );
         }
-        if (!ignoreFocus && (descr->focus_item == index) &&
-            (descr->caret_on) &&
-            (descr->in_focus)) DrawFocusRect( hdc, rect );
+        if (focused)
+            DrawFocusRect( hdc, rect );
     }
 }