Remove commented code

psieg · Apr 12, 2024 · c4ff644 · c4ff644
1 parent cd4d588
commit c4ff644
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/Software/grab/GrabberBase.cpp b/Software/grab/GrabberBase.cpp
@@ -96,15 +96,13 @@ bool GrabberBase::isGrabbingStarted() const
 
 const GrabbedScreen * GrabberBase::screenOfWidget(const GrabWidget& widget) const
 {
-//#ifdef Q_OS_WIN
-//	// Note that in Qt > 6 we can't use rect matching because the widget coords are in a device-independent
-//	// coordinate system while the screen coords are in the physical one.
-//	HMONITOR widgetMonitor = MonitorFromWindow(reinterpret_cast<HWND>(widget.winId()), MONITOR_DEFAULTTONULL);
-//	for (int i = 0; i < _screensWithWidgets.size(); ++i) {
-//		if (_screensWithWidgets[i].screenInfo.handle == widgetMonitor)
-//			return &_screensWithWidgets[i];
-//	}
-//#else
+#ifdef Q_OS_WIN
+	HMONITOR widgetMonitor = MonitorFromWindow(reinterpret_cast<HWND>(widget.winId()), MONITOR_DEFAULTTONULL);
+	for (int i = 0; i < _screensWithWidgets.size(); ++i) {
+		if (_screensWithWidgets[i].screenInfo.handle == widgetMonitor)
+			return &_screensWithWidgets[i];
+	}
+#else
 	QRect rect = widget.deviceFrameGeometry();
 	QPoint center = rect.center();
 	for (int i = 0; i < _screensWithWidgets.size(); ++i) {
@@ -115,7 +113,7 @@ const GrabbedScreen * GrabberBase::screenOfWidget(const GrabWidget& widget) cons
 		if (_screensWithWidgets[i].screenInfo.rect.intersects(rect))
 			return &_screensWithWidgets[i];
 	};
-//#endif
+#endif
 	return NULL;
 }