Check if resize area is null

ui/platform/ui_platform_window.cpp

@@ -149,10 +149,11 @@ void DefaultWindowHelper::init() {
 
 	window()->widthValue(
 	) | rpl::start_with_next([=](int width) {
+		const auto area = resizeArea();
 		_title->setGeometry(
-			resizeArea().left(),
+			area.left(),
-			resizeArea().top(),
+			area.top(),
-			width - resizeArea().left() - resizeArea().right(),
+			width - area.left() - area.right(),
 			_title->st()->height);
 	}, _title->lifetime());
 
@@ -160,20 +161,24 @@ void DefaultWindowHelper::init() {
 		window()->sizeValue(),
 		_title->heightValue()
 	) | rpl::start_with_next([=](QSize size, int titleHeight) {
+		const auto area = resizeArea();
+
 		const auto sizeWithoutMargins = size
 			.shrunkBy({ 0, titleHeight, 0, 0 })
-			.shrunkBy(resizeArea());
+			.shrunkBy(area);
 
 		const auto topLeft = QPoint(
-			resizeArea().left(),
+			area.left(),
-			resizeArea().top() + titleHeight);
+			area.top() + titleHeight);
 
 		_body->setGeometry(QRect(topLeft, sizeWithoutMargins));
 	}, _body->lifetime());
 
 	window()->paintRequest(
 	) | rpl::start_with_next([=] {
-		if (resizeArea().isNull()) {
+		const auto area = resizeArea();
+
+		if (area.isNull()) {
 			return;
 		}
 
@@ -182,7 +187,7 @@ void DefaultWindowHelper::init() {
 		if (hasShadow()) {
 			Ui::Shadow::paint(
 				p,
-				QRect(QPoint(), window()->size()).marginsRemoved(resizeArea()),
+				QRect(QPoint(), window()->size()).marginsRemoved(area),
 				window()->width(),
 				Shadow());
 		} else {
@@ -234,29 +239,33 @@ QMargins DefaultWindowHelper::resizeArea() const {
 }
 
 Qt::Edges DefaultWindowHelper::edgesFromPos(const QPoint &pos) const {
-	if (pos.x() <= resizeArea().left()) {
+	const auto area = resizeArea();
-		if (pos.y() <= resizeArea().top()) {
+
+	if (area.isNull()) {
+		return Qt::Edges();
+	} else if (pos.x() <= area.left()) {
+		if (pos.y() <= area.top()) {
 			return Qt::LeftEdge | Qt::TopEdge;
-		} else if (pos.y() >= (window()->height() - resizeArea().bottom())) {
+		} else if (pos.y() >= (window()->height() - area.bottom())) {
 			return Qt::LeftEdge | Qt::BottomEdge;
 		}
 
 		return Qt::LeftEdge;
-	} else if (pos.x() >= (window()->width() - resizeArea().right())) {
+	} else if (pos.x() >= (window()->width() - area.right())) {
-		if (pos.y() <= resizeArea().top()) {
+		if (pos.y() <= area.top()) {
 			return Qt::RightEdge | Qt::TopEdge;
-		} else if (pos.y() >= (window()->height() - resizeArea().bottom())) {
+		} else if (pos.y() >= (window()->height() - area.bottom())) {
 			return Qt::RightEdge | Qt::BottomEdge;
 		}
 
 		return Qt::RightEdge;
-	} else if (pos.y() <= resizeArea().top()) {
+	} else if (pos.y() <= area.top()) {
 		return Qt::TopEdge;
-	} else if (pos.y() >= (window()->height() - resizeArea().bottom())) {
+	} else if (pos.y() >= (window()->height() - area.bottom())) {
 		return Qt::BottomEdge;
-	} else {
-		return Qt::Edges();
 	}
+
+	return Qt::Edges();
 }
 
 bool DefaultWindowHelper::eventFilter(QObject *obj, QEvent *e) {
@@ -282,11 +291,12 @@ void DefaultWindowHelper::setTitle(const QString &title) {
 }
 
 void DefaultWindowHelper::setTitleStyle(const style::WindowTitle &st) {
+	const auto area = resizeArea();
 	_title->setStyle(st);
 	_title->setGeometry(
-		resizeArea().left(),
+		area.left(),
-		resizeArea().top(),
+		area.top(),
-		window()->width() - resizeArea().left() - resizeArea().right(),
+		window()->width() - area.left() - area.right(),
 		_title->st()->height);
 }
 
@@ -324,32 +334,34 @@ void DefaultWindowHelper::paintBorders(QPainter &p) {
 		? titleBackground
 		: defaultTitleBackground;
 
+	const auto area = resizeArea();
+
 	p.fillRect(
 		0,
-		resizeArea().top(),
+		area.top(),
-		resizeArea().left(),
+		area.left(),
-		window()->height() - resizeArea().top() - resizeArea().bottom(),
+		window()->height() - area.top() - area.bottom(),
 		borderColor);
 
 	p.fillRect(
-		window()->width() - resizeArea().right(),
+		window()->width() - area.right(),
-		resizeArea().top(),
+		area.top(),
-		resizeArea().right(),
+		area.right(),
-		window()->height() - resizeArea().top() - resizeArea().bottom(),
+		window()->height() - area.top() - area.bottom(),
 		borderColor);
 
 	p.fillRect(
 		0,
 		0,
 		window()->width(),
-		resizeArea().top(),
+		area.top(),
 		borderColor);
 
 	p.fillRect(
 		0,
-		window()->height() - resizeArea().bottom(),
+		window()->height() - area.bottom(),
 		window()->width(),
-		resizeArea().bottom(),
+		area.bottom(),
 		borderColor);
 }