From c0024748e8ff2f46e5d37a054fa349f24ddc497f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Fri, 5 Aug 2022 16:45:08 +0200 Subject: Rename Dragger functions. --- c/layout.h | 14 +++++++------- c/listview.cpp | 2 +- c/main.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/c/layout.h b/c/layout.h index 3c616b7..cbdcac7 100644 --- a/c/layout.h +++ b/c/layout.h @@ -12,14 +12,14 @@ void UpdateLayout(int w = 0, int h = 0); /* Dragger objects implement draggable portions of the client area, - * such as the split between two list views. HandleDown and HandleMove - * are called by relevant window procedures upon WM_(NC)LBUTTONDOWN - * and WM_SETCURSOR. */ + * such as the split between two list views. HandleLButtonDown and + * HandleSetCursor are called by relevant window procedures upon + * WM_(NC)LBUTTONDOWN and WM_SETCURSOR. */ struct Dragger { - bool HandleDown(); - bool HandleMove(); + bool HandleLButtonDown(); + bool HandleSetCursor(); protected: bool IsDown(); bool IsDouble(); @@ -63,7 +63,7 @@ inline bool Dragger::IsDown() return GetKeyState(VK_LBUTTON) & 0x8000; } -inline bool Dragger::HandleDown() +inline bool Dragger::HandleLButtonDown() { extern HWND g_hWnd; POINT pt; @@ -79,7 +79,7 @@ inline bool Dragger::HandleDown() return m_bActive; } -inline bool Dragger::HandleMove() +inline bool Dragger::HandleSetCursor() { extern HWND g_hWnd; POINT pt; diff --git a/c/listview.cpp b/c/listview.cpp index 0392941..8224c0a 100644 --- a/c/listview.cpp +++ b/c/listview.cpp @@ -73,7 +73,7 @@ LRESULT CALLBACK ListView::WndProc(const HWND hWnd, const UINT uMsg, break; case WM_LBUTTONDOWN: case WM_NCLBUTTONDOWN: - if (g_dragDlv.HandleDown()) + if (g_dragDlv.HandleLButtonDown()) return 0; break; } diff --git a/c/main.cpp b/c/main.cpp index b8303b5..a672c51 100644 --- a/c/main.cpp +++ b/c/main.cpp @@ -355,10 +355,10 @@ LRESULT CALLBACK WndProc(const HWND hWnd, const UINT uMsg, const WPARAM wParam, break; } case WM_LBUTTONDOWN: - g_dragDlv.HandleDown(); + g_dragDlv.HandleLButtonDown(); break; case WM_SETCURSOR: - if (!g_dragDlv.HandleMove()) { + if (!g_dragDlv.HandleSetCursor()) { /* Use default cursor. */ if (reinterpret_cast(wParam) == hWnd) return DefWindowProc(hWnd, uMsg, wParam, lParam); -- cgit v1.2.3