Allow querying manual rounding radius of RpWindow.

desktop-app · Feb 17, 2023 · 3b69ec4 · 3b69ec4
1 parent eb4d44e
commit 3b69ec4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/ui/platform/ui_platform_window.cpp b/ui/platform/ui_platform_window.cpp
@@ -188,6 +188,10 @@ void BasicWindowHelper::close() {
 	_window->close();
 }
 
+int BasicWindowHelper::manualRoundingRadius() const {
+	return 0;
+}
+
 void BasicWindowHelper::setBodyTitleArea(
 		Fn<WindowTitleHitTestFlags(QPoint)> testMethod) {
 	Expects(!_bodyTitleAreaTestMethod || testMethod);
@@ -524,6 +528,10 @@ void DefaultWindowHelper::setGeometry(QRect rect) {
 	window()->setGeometry(rect.marginsAdded(bodyPadding()));
 }
 
+int DefaultWindowHelper::manualRoundingRadius() const {
+	return _roundingOverlay ? Radius() : 0;
+}
+
 void DefaultWindowHelper::paintBorders(QPainter &p) {
 	const auto titleBackground = window()->isActiveWindow()
 		? _title->st()->bgActive

diff --git a/ui/platform/ui_platform_window.h b/ui/platform/ui_platform_window.h
@@ -59,6 +59,7 @@ class BasicWindowHelper {
 	virtual void showNormal();
 	virtual void close();
 
+	virtual int manualRoundingRadius() const;
 	void setBodyTitleArea(Fn<WindowTitleHitTestFlags(QPoint)> testMethod);
 
 protected:
@@ -91,6 +92,7 @@ class DefaultWindowHelper final : public QObject, public BasicWindowHelper {
 	void setMinimumSize(QSize size) override;
 	void setFixedSize(QSize size) override;
 	void setGeometry(QRect rect) override;
+	int manualRoundingRadius() const override;
 
 protected:
 	bool eventFilter(QObject *obj, QEvent *e) override;

diff --git a/ui/widgets/rp_window.cpp b/ui/widgets/rp_window.cpp
@@ -99,4 +99,8 @@ void RpWindow::setBodyTitleArea(
 	_helper->setBodyTitleArea(std::move(testMethod));
 }
 
+int RpWindow::manualRoundingRadius() const {
+	return _helper->manualRoundingRadius();
+}
+
 } // namespace Ui
diff --git a/ui/widgets/rp_window.h b/ui/widgets/rp_window.h
@@ -65,6 +65,7 @@ class RpWindow : public RpWidget {
 	void showFullScreen();
 	void showNormal();
 	void close();
+	[[nodiscard]] int manualRoundingRadius() const;
 	void setBodyTitleArea(Fn<WindowTitleHitTestFlags(QPoint)> testMethod);
 
 private: