From 5d475f54f0c8aa19693d13ec9a4f418f63018052 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Mon, 28 Feb 2022 19:12:26 +0300
Subject: [PATCH] Enlarge padded title controls hit area.

---
 ui/platform/ui_platform_window_title.cpp | 18 +++++++++++-------
 ui/platform/ui_platform_window_title.h   |  2 +-
 ui/platform/win/ui_window_title_win.cpp  |  5 ++++-
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ui/platform/ui_platform_window_title.cpp b/ui/platform/ui_platform_window_title.cpp
index 33a9bf3..5c22615 100644
--- a/ui/platform/ui_platform_window_title.cpp
+++ b/ui/platform/ui_platform_window_title.cpp
@@ -218,15 +218,18 @@ void TitleControls::raise() {
 	_close->raise();
 }
 
-HitTestResult TitleControls::hitTest(QPoint point) const {
-	const auto test = [&](const object_ptr<Button> &button) {
-		return button && button->geometry().contains(point);
+HitTestResult TitleControls::hitTest(QPoint point, int padding) const {
+	const auto parent = _close->parentWidget()->geometry();
+	const auto test = [&](const object_ptr<Button> &button, bool close) {
+		return button && button->geometry().marginsAdded(
+			{ close ? padding : 0, padding, close ? padding : 0, 0 }
+		).contains(point);
 	};
-	if (test(_minimize)) {
+	if (test(_minimize, false)) {
 		return HitTestResult::Minimize;
-	} else if (test(_maximizeRestore)) {
+	} else if (test(_maximizeRestore, false)) {
 		return HitTestResult::MaximizeRestore;
-	} else if (test(_close)) {
+	} else if (test(_close, true)) {
 		return HitTestResult::Close;
 	}
 	return HitTestResult::None;
@@ -502,7 +505,8 @@ std::unique_ptr<SeparateTitleControls> SetupSeparateTitleControls(
 	) | rpl::start_with_next([=](not_null<HitTestRequest*> request) {
 		const auto origin = raw->wrap.pos();
 		const auto relative = request->point - origin;
-		const auto controlsResult = raw->controls.hitTest(relative);
+		const auto padding = window->additionalContentPadding();
+		const auto controlsResult = raw->controls.hitTest(relative, padding);
 		if (controlsResult != HitTestResult::None) {
 			request->result = controlsResult;
 		}
diff --git a/ui/platform/ui_platform_window_title.h b/ui/platform/ui_platform_window_title.h
index 2e493d9..e61b37d 100644
--- a/ui/platform/ui_platform_window_title.h
+++ b/ui/platform/ui_platform_window_title.h
@@ -68,7 +68,7 @@ public:
 	void setResizeEnabled(bool enabled);
 	void raise();
 
-	[[nodiscard]] HitTestResult hitTest(QPoint point) const;
+	[[nodiscard]] HitTestResult hitTest(QPoint point, int padding) const;
 
 	void buttonOver(HitTestResult testResult);
 	void buttonDown(HitTestResult testResult);
diff --git a/ui/platform/win/ui_window_title_win.cpp b/ui/platform/win/ui_window_title_win.cpp
index 6522c6c..4defa64 100644
--- a/ui/platform/win/ui_window_title_win.cpp
+++ b/ui/platform/win/ui_window_title_win.cpp
@@ -130,7 +130,10 @@ HitTestResult TitleWidget::hitTest(QPoint point) const {
 	const auto origin = _paddingHelper
 		? _paddingHelper->controlsParent.pos()
 		: QPoint();
-	const auto controlsResult = _controls.hitTest(point - origin);
+	const auto padding = _paddingHelper
+		? _paddingHelper->padding.current()
+		: 0;
+	const auto controlsResult = _controls.hitTest(point - origin, padding);
 	return (controlsResult != HitTestResult::None)
 		? controlsResult
 		: HitTestResult::Caption;