[PATCH 4/4] comctl32/edit: Merge theming logic
Nikolay Sivov
nsivov at codeweavers.com
Wed Jan 31 04:15:44 CST 2018
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/comctl32/Makefile.in | 1 -
dlls/comctl32/edit.c | 180 +++++++++++++++++++++++++++++++--------------
dlls/comctl32/theme_edit.c | 134 ---------------------------------
dlls/comctl32/theming.c | 3 -
4 files changed, 124 insertions(+), 194 deletions(-)
delete mode 100644 dlls/comctl32/theme_edit.c
diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in
index 438da91ca0..db65bbc400 100644
--- a/dlls/comctl32/Makefile.in
+++ b/dlls/comctl32/Makefile.in
@@ -35,7 +35,6 @@ C_SRCS = \
theme_button.c \
theme_combo.c \
theme_dialog.c \
- theme_edit.c \
theme_listbox.c \
theme_scrollbar.c \
theming.c \
diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c
index 3537624040..6740f230f8 100644
--- a/dlls/comctl32/edit.c
+++ b/dlls/comctl32/edit.c
@@ -4,6 +4,7 @@
* Copyright David W. Metcalfe, 1994
* Copyright William Magro, 1995, 1996
* Copyright Frans van Dorsselaer, 1996, 1997
+ * Copyright Frank Richter, 2005
*
*
* This library is free software; you can redistribute it and/or
@@ -54,6 +55,8 @@
#include "imm.h"
#include "usp10.h"
#include "commctrl.h"
+#include "uxtheme.h"
+#include "vsstyle.h"
#include "wine/unicode.h"
#include "wine/debug.h"
@@ -3596,6 +3599,50 @@ static void EDIT_WM_Paint(EDITSTATE *es, HDC hdc)
EndPaint(es->hwndSelf, &ps);
}
+static void EDIT_WM_NCPaint(HWND hwnd, HRGN region)
+{
+ DWORD exStyle = GetWindowLongW(hwnd, GWL_EXSTYLE);
+ HTHEME theme = GetWindowTheme(hwnd);
+ HRGN cliprgn = region;
+
+ if (theme && exStyle & WS_EX_CLIENTEDGE)
+ {
+ HDC dc;
+ RECT r;
+ int cxEdge = GetSystemMetrics(SM_CXEDGE),
+ cyEdge = GetSystemMetrics(SM_CYEDGE);
+ const int part = EP_EDITTEXT;
+ int state = ETS_NORMAL;
+ DWORD dwStyle = GetWindowLongW(hwnd, GWL_STYLE);
+
+ if (!IsWindowEnabled(hwnd))
+ state = ETS_DISABLED;
+ else if (dwStyle & ES_READONLY)
+ state = ETS_READONLY;
+ else if (GetFocus() == hwnd)
+ state = ETS_FOCUSED;
+
+ GetWindowRect(hwnd, &r);
+
+ /* New clipping region passed to default proc to exclude border */
+ cliprgn = CreateRectRgn(r.left + cxEdge, r.top + cyEdge,
+ r.right - cxEdge, r.bottom - cyEdge);
+ if (region != (HRGN)1)
+ CombineRgn(cliprgn, cliprgn, region, RGN_AND);
+ OffsetRect(&r, -r.left, -r.top);
+
+ dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN);
+ OffsetRect(&r, -r.left, -r.top);
+
+ if (IsThemeBackgroundPartiallyTransparent(theme, part, state))
+ DrawThemeParentBackground(hwnd, dc, &r);
+ DrawThemeBackground(theme, dc, part, state, &r, 0);
+ ReleaseDC(hwnd, dc);
+ }
+
+ /* Call default proc to get the scrollbars etc. also painted */
+ DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0);
+}
/*********************************************************************
*
@@ -4356,48 +4403,49 @@ cleanup:
* WM_CREATE
*
*/
-static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name)
+static LRESULT EDIT_WM_Create(EDITSTATE *es, const WCHAR *name)
{
- RECT clientRect;
+ RECT clientRect;
+
+ TRACE("%s\n", debugstr_w(name));
+ /*
+ * To initialize some final structure members, we call some helper
+ * functions. However, since the EDITSTATE is not consistent (i.e.
+ * not fully initialized), we should be very careful which
+ * functions can be called, and in what order.
+ */
+ EDIT_WM_SetFont(es, 0, FALSE);
+ EDIT_EM_EmptyUndoBuffer(es);
- TRACE("%s\n", debugstr_w(name));
- /*
- * To initialize some final structure members, we call some helper
- * functions. However, since the EDITSTATE is not consistent (i.e.
- * not fully initialized), we should be very careful which
- * functions can be called, and in what order.
- */
- EDIT_WM_SetFont(es, 0, FALSE);
- EDIT_EM_EmptyUndoBuffer(es);
+ /* We need to calculate the format rect
+ (applications may send EM_SETMARGINS before the control gets visible) */
+ GetClientRect(es->hwndSelf, &clientRect);
+ EDIT_SetRectNP(es, &clientRect);
+
+ if (name && *name)
+ {
+ EDIT_EM_ReplaceSel(es, FALSE, name, strlenW(name), FALSE, FALSE);
+ /* if we insert text to the editline, the text scrolls out
+ * of the window, as the caret is placed after the insert
+ * pos normally; thus we reset es->selection... to 0 and
+ * update caret
+ */
+ es->selection_start = es->selection_end = 0;
+ /* Adobe Photoshop does NOT like this. and MSDN says that EN_CHANGE
+ * Messages are only to be sent when the USER does something to
+ * change the contents. So I am removing this EN_CHANGE
+ *
+ * EDIT_NOTIFY_PARENT(es, EN_CHANGE);
+ */
+ EDIT_EM_ScrollCaret(es);
+ }
+ /* force scroll info update */
+ EDIT_UpdateScrollInfo(es);
+ OpenThemeData(es->hwndSelf, WC_EDITW);
- /* We need to calculate the format rect
- (applications may send EM_SETMARGINS before the control gets visible) */
- GetClientRect(es->hwndSelf, &clientRect);
- EDIT_SetRectNP(es, &clientRect);
-
- if (name && *name) {
- EDIT_EM_ReplaceSel(es, FALSE, name, strlenW(name), FALSE, FALSE);
- /* if we insert text to the editline, the text scrolls out
- * of the window, as the caret is placed after the insert
- * pos normally; thus we reset es->selection... to 0 and
- * update caret
- */
- es->selection_start = es->selection_end = 0;
- /* Adobe Photoshop does NOT like this. and MSDN says that EN_CHANGE
- * Messages are only to be sent when the USER does something to
- * change the contents. So I am removing this EN_CHANGE
- *
- * EDIT_NOTIFY_PARENT(es, EN_CHANGE);
- */
- EDIT_EM_ScrollCaret(es);
- }
- /* force scroll info update */
- EDIT_UpdateScrollInfo(es);
- /* The rule seems to return 1 here for success */
- /* Power Builder masked edit controls will crash */
- /* if not. */
- /* FIXME: is that in all cases so ? */
- return 1;
+ /* The rule seems to return 1 here for success, Power Builder masked edit controls will crash if not. */
+ /* FIXME: is that in all cases so ? */
+ return 1;
}
@@ -4408,31 +4456,36 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name)
*/
static LRESULT EDIT_WM_NCDestroy(EDITSTATE *es)
{
- LINEDEF *pc, *pp;
+ LINEDEF *pc, *pp;
+ HTHEME theme;
- /* The app can own the text buffer handle */
- if (es->hloc32W && (es->hloc32W != es->hlocapp)) {
- LocalFree(es->hloc32W);
- }
- EDIT_InvalidateUniscribeData(es);
- pc = es->first_line_def;
- while (pc)
- {
- pp = pc->next;
- HeapFree(GetProcessHeap(), 0, pc);
- pc = pp;
- }
+ theme = GetWindowTheme(es->hwndSelf);
+ CloseThemeData(theme);
- SetWindowLongPtrW( es->hwndSelf, 0, 0 );
- HeapFree(GetProcessHeap(), 0, es->undo_text);
- HeapFree(GetProcessHeap(), 0, es);
+ /* The app can own the text buffer handle */
+ if (es->hloc32W && (es->hloc32W != es->hlocapp))
+ LocalFree(es->hloc32W);
- return 0;
+ EDIT_InvalidateUniscribeData(es);
+ pc = es->first_line_def;
+ while (pc)
+ {
+ pp = pc->next;
+ HeapFree(GetProcessHeap(), 0, pc);
+ pc = pp;
+ }
+
+ SetWindowLongPtrW( es->hwndSelf, 0, 0 );
+ HeapFree(GetProcessHeap(), 0, es->undo_text);
+ HeapFree(GetProcessHeap(), 0, es);
+
+ return 0;
}
static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
EDITSTATE *es = (EDITSTATE *)GetWindowLongPtrW(hwnd, 0);
+ HTHEME theme = GetWindowTheme(hwnd);
LRESULT result = 0;
RECT *rect;
@@ -4732,6 +4785,8 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
case WM_ENABLE:
es->bEnableState = (BOOL) wParam;
EDIT_UpdateText(es, NULL, TRUE);
+ if (theme)
+ RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW);
break;
case WM_ERASEBKGND:
@@ -4761,6 +4816,8 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
case WM_KILLFOCUS:
result = EDIT_WM_KillFocus(es);
+ if (theme)
+ RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW);
break;
case WM_LBUTTONDBLCLK:
@@ -4788,12 +4845,18 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
EDIT_WM_Paint(es, (HDC)wParam);
break;
+ case WM_NCPAINT:
+ EDIT_WM_NCPaint(hwnd, (HRGN)wParam);
+ break;
+
case WM_PASTE:
EDIT_WM_Paste(es);
break;
case WM_SETFOCUS:
EDIT_WM_SetFocus(es);
+ if (theme)
+ RedrawWindow(hwnd, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW);
break;
case WM_SETFONT:
@@ -4916,6 +4979,11 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR
}
break;
+ case WM_THEMECHANGED:
+ CloseThemeData (theme);
+ OpenThemeData(hwnd, WC_EDITW);
+ break;
+
default:
result = DefWindowProcW(hwnd, msg, wParam, lParam);
break;
diff --git a/dlls/comctl32/theme_edit.c b/dlls/comctl32/theme_edit.c
deleted file mode 100644
index ff4e56c069..0000000000
--- a/dlls/comctl32/theme_edit.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Theming - Edit control
- *
- * Copyright (c) 2005 by Frank Richter
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
-
-#include <stdarg.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
-#include "uxtheme.h"
-#include "vssym32.h"
-#include "comctl32.h"
-#include "wine/debug.h"
-
-/* Draw themed border */
-static void nc_paint (HTHEME theme, HWND hwnd, HRGN region)
-{
- HRGN cliprgn = region;
- DWORD exStyle = GetWindowLongW (hwnd, GWL_EXSTYLE);
- if (exStyle & WS_EX_CLIENTEDGE)
- {
- HDC dc;
- RECT r;
- int cxEdge = GetSystemMetrics (SM_CXEDGE),
- cyEdge = GetSystemMetrics (SM_CYEDGE);
- int part = EP_EDITTEXT;
- int state = ETS_NORMAL;
- DWORD dwStyle = GetWindowLongW (hwnd, GWL_STYLE);
-
- if (!IsWindowEnabled (hwnd))
- state = ETS_DISABLED;
- else if (dwStyle & ES_READONLY)
- state = ETS_READONLY;
- else if (GetFocus() == hwnd)
- state = ETS_FOCUSED;
-
- GetWindowRect(hwnd, &r);
-
- /* New clipping region passed to default proc to exclude border */
- cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge,
- r.right - cxEdge, r.bottom - cyEdge);
- if (region != (HRGN)1)
- CombineRgn (cliprgn, cliprgn, region, RGN_AND);
- OffsetRect(&r, -r.left, -r.top);
-
- dc = GetDCEx(hwnd, region, DCX_WINDOW|DCX_INTERSECTRGN);
- OffsetRect(&r, -r.left, -r.top);
-
- if (IsThemeBackgroundPartiallyTransparent (theme, part, state))
- DrawThemeParentBackground(hwnd, dc, &r);
- DrawThemeBackground (theme, dc, part, state, &r, 0);
- ReleaseDC(hwnd, dc);
- }
-
- /* Call default proc to get the scrollbars etc. also painted */
- DefWindowProcW (hwnd, WM_NCPAINT, (WPARAM)cliprgn, 0);
-}
-
-/**********************************************************************
- * The edit control subclass window proc.
- */
-LRESULT CALLBACK THEMING_EditSubclassProc (HWND hwnd, UINT msg,
- WPARAM wParam, LPARAM lParam,
- ULONG_PTR dwRefData)
-{
- const WCHAR* themeClass = WC_EDITW;
- HTHEME theme;
- LRESULT result;
-
- switch (msg)
- {
- case WM_CREATE:
- result = THEMING_CallOriginalClass (hwnd, msg, wParam, lParam);
- OpenThemeData( hwnd, themeClass );
- return result;
-
- case WM_DESTROY:
- theme = GetWindowTheme( hwnd );
- CloseThemeData ( theme );
- return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam);
-
- case WM_THEMECHANGED:
- theme = GetWindowTheme( hwnd );
- CloseThemeData ( theme );
- OpenThemeData( hwnd, themeClass );
- break;
-
- case WM_SYSCOLORCHANGE:
- theme = GetWindowTheme( hwnd );
- if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam);
- /* Do nothing. When themed, a WM_THEMECHANGED will be received, too,
- * which will do the repaint. */
- break;
-
- case WM_NCPAINT:
- theme = GetWindowTheme( hwnd );
- if (!theme) return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam);
- nc_paint (theme, hwnd, (HRGN)wParam);
- break;
-
- case WM_ENABLE:
- case WM_KILLFOCUS:
- case WM_SETFOCUS:
- theme = GetWindowTheme( hwnd );
- if (theme) RedrawWindow (hwnd, NULL, NULL,
- RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW);
- return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam);
-
- default:
- /* Call old proc */
- return THEMING_CallOriginalClass (hwnd, msg, wParam, lParam);
- }
- return 0;
-}
diff --git a/dlls/comctl32/theming.c b/dlls/comctl32/theming.c
index 93d6fe61f4..0f722fddce 100644
--- a/dlls/comctl32/theming.c
+++ b/dlls/comctl32/theming.c
@@ -60,7 +60,6 @@ static const struct ThemingSubclass
{WC_BUTTONW, THEMING_ButtonSubclassProc},
{WC_COMBOBOXW, THEMING_ComboSubclassProc},
{comboLboxClass, THEMING_ListBoxSubclassProc},
- {WC_EDITW, THEMING_EditSubclassProc},
{WC_LISTBOXW, THEMING_ListBoxSubclassProc},
{WC_SCROLLBARW, THEMING_ScrollbarSubclassProc}
};
@@ -98,7 +97,6 @@ MAKE_SUBCLASS_PROC(2)
MAKE_SUBCLASS_PROC(3)
MAKE_SUBCLASS_PROC(4)
MAKE_SUBCLASS_PROC(5)
-MAKE_SUBCLASS_PROC(6)
static const WNDPROC subclassProcs[NUM_SUBCLASSES] = {
subclass_proc0,
@@ -107,7 +105,6 @@ static const WNDPROC subclassProcs[NUM_SUBCLASSES] = {
subclass_proc3,
subclass_proc4,
subclass_proc5,
- subclass_proc6
};
/***********************************************************************
--
2.15.1
More information about the wine-devel
mailing list