Move DragHandler to separated file

CefView · Sep 27, 2023 · 37f6ae5 · 37f6ae5
1 parent f0b2d7f
commit 37f6ae5
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 37 deletions.
diff --git a/CefViewCore b/CefViewCore
diff --git a/src/details/CCefClientDelegate.h b/src/details/CCefClientDelegate.h
@@ -92,11 +92,6 @@ class CCefClientDelegate
                             CefRefPtr<CefFileDialogCallback> callback) override;
 
   // DisplayHandler
-  virtual bool onDragEnter(CefRefPtr<CefBrowser> browser,
-                           CefRefPtr<CefDragData> dragData,
-                           CefDragHandler::DragOperationsMask mask) override;
-  virtual void draggableRegionChanged(CefRefPtr<CefBrowser>& browser,
-                                      const std::vector<CefDraggableRegion>& regions) override;
   virtual void addressChanged(CefRefPtr<CefBrowser>& browser, int64_t frameId, const std::string& url) override;
   virtual void titleChanged(CefRefPtr<CefBrowser>& browser, const std::string& title) override;
   virtual void faviconURLChanged(CefRefPtr<CefBrowser> browser, const std::vector<CefString>& icon_urls) override;
@@ -119,6 +114,12 @@ class CCefClientDelegate
   virtual void onDownloadUpdated(CefRefPtr<CefBrowser> browser,
                                  CefRefPtr<CefDownloadItem> download_item,
                                  CefRefPtr<CefDownloadItemCallback> callback) override;
+  // DragHandler
+  virtual bool onDragEnter(CefRefPtr<CefBrowser> browser,
+                           CefRefPtr<CefDragData> dragData,
+                           CefDragHandler::DragOperationsMask mask) override;
+  virtual void draggableRegionChanged(CefRefPtr<CefBrowser>& browser,
+                                      const std::vector<CefDraggableRegion>& regions) override;
 
   // FocusHandler
   virtual void takeFocus(CefRefPtr<CefBrowser>& browser, bool next) override;

diff --git a/src/details/CCefClientDelegate_DisplayHandler.cpp b/src/details/CCefClientDelegate_DisplayHandler.cpp
@@ -65,37 +65,6 @@ mapCursorShape(cef_cursor_type_t& type)
   return sCursorTable[type];
 }
 
-bool
-CCefClientDelegate::onDragEnter(CefRefPtr<CefBrowser> browser,
-                                CefRefPtr<CefDragData> dragData,
-                                CefDragHandler::DragOperationsMask mask)
-{
-  // Return false for default drag handling behavior or true to cancel the drag event.
-  return !pCefViewPrivate_->q_ptr->isDragAndDropEnabled();
-}
-
-void
-CCefClientDelegate::draggableRegionChanged(CefRefPtr<CefBrowser>& browser,
-                                           const std::vector<CefDraggableRegion>& regions)
-{
-  if (!IsValidBrowser(browser))
-    return;
-
-  // Determine new draggable region.
-  QRegion draggableRegion;
-  QRegion nonDraggableRegion;
-  std::vector<CefDraggableRegion>::const_iterator it = regions.begin();
-  for (; it != regions.end(); ++it) {
-    if (it->draggable) {
-      draggableRegion += QRegion(it->bounds.x, it->bounds.y, it->bounds.width, it->bounds.height);
-    } else {
-      nonDraggableRegion += QRegion(it->bounds.x, it->bounds.y, it->bounds.width, it->bounds.height);
-    }
-  }
-
-  pCefViewPrivate_->q_ptr->draggableRegionChanged(draggableRegion, nonDraggableRegion);
-}
-
 void
 CCefClientDelegate::addressChanged(CefRefPtr<CefBrowser>& browser, int64_t frameId, const std::string& url)
 {

diff --git a/src/details/CCefClientDelegate_DragHandler.cpp b/src/details/CCefClientDelegate_DragHandler.cpp
@@ -0,0 +1,38 @@
+#include "CCefClientDelegate.h"
+
+#include <QDebug>
+#include <QSharedPointer>
+#include <QThread>
+
+#include "QCefViewPrivate.h"
+
+bool
+CCefClientDelegate::onDragEnter(CefRefPtr<CefBrowser> browser,
+                                CefRefPtr<CefDragData> dragData,
+                                CefDragHandler::DragOperationsMask mask)
+{
+  // Return false for default drag handling behavior or true to cancel the drag event.
+  return !pCefViewPrivate_->q_ptr->isDragAndDropEnabled();
+}
+
+void
+CCefClientDelegate::draggableRegionChanged(CefRefPtr<CefBrowser>& browser,
+                                           const std::vector<CefDraggableRegion>& regions)
+{
+  if (!IsValidBrowser(browser))
+    return;
+
+  // Determine new draggable region.
+  QRegion draggableRegion;
+  QRegion nonDraggableRegion;
+  std::vector<CefDraggableRegion>::const_iterator it = regions.begin();
+  for (; it != regions.end(); ++it) {
+    if (it->draggable) {
+      draggableRegion += QRegion(it->bounds.x, it->bounds.y, it->bounds.width, it->bounds.height);
+    } else {
+      nonDraggableRegion += QRegion(it->bounds.x, it->bounds.y, it->bounds.width, it->bounds.height);
+    }
+  }
+
+  pCefViewPrivate_->q_ptr->draggableRegionChanged(draggableRegion, nonDraggableRegion);
+}