Mercurial > hg > toolkit / file diff

--- a/ui/winui/table.h	Thu Oct 19 21:19:19 2023 +0200
+++ b/ui/winui/table.h	Fri Oct 20 16:34:33 2023 +0200
@@ -30,6 +30,7 @@
 
 #include "../ui/tree.h"
 #include "toolkit.h"
+#include "dnd.h"
 
 #include "../ui/container.h"
 
@@ -39,14 +40,6 @@
 
 } UiTableColumn;
 
-struct UiWinuiTableDnd {
-	UiTableDndEvent evtobj;
-	int evttype = 0;
-	winrt::Microsoft::UI::Xaml::DragStartingEventArgs dndstartargs = { nullptr };
-	winrt::Microsoft::UI::Xaml::DropCompletedEventArgs dndcompletedargs = { nullptr };
-	winrt::Microsoft::UI::Xaml::DragEventArgs drageventargs = { nullptr };
-};
-
 typedef struct UiTable {
 	winrt::Microsoft::UI::Xaml::Controls::ScrollViewer scrollw;
 	winrt::Microsoft::UI::Xaml::Controls::Grid grid;
@@ -72,8 +65,6 @@
 	int lastSelection = 0;
 	ULONG64 lastPointerPress = 0;
 	std::vector<int> selection;
-	bool enabledrag = false; // TODO: remove
-	bool enabledrop = false; // TODO: remove
 
 	UiTable(UiObject *obj, winrt::Microsoft::UI::Xaml::Controls::ScrollViewer scrollW, winrt::Microsoft::UI::Xaml::Controls::Grid grid);