callback test

TestApp1/TestApp1.cpp

@@ -17,8 +17,16 @@ public:
 		DKLog("%s", DKGL_FUNCTION_NAME);
 		DKWindow::WindowCallback cb = {};
 
-		cb.filesDropped = DKFunction([](DKWindow*, const DKPoint&, const DKWindow::WindowCallback::StringArray&) {
-			DKLog("cb.filesDropped");
+		cb.draggingFeedback = DKFunction([](DKWindow*, DKWindow::DraggingState state, const DKPoint&, const DKStringArray&) {
+			DKLog("cb.draggingFeedback: state:%d", state);
+			return DKWindow::DragOperationCopy;
+		});
+		cb.closeRequest = DKFunction([](DKWindow* window)
+		{
+			DKLog("Close request?");
+			if (DKIsDebuggerPresent())
+				return false;
+			return true;
 		});
 
 		window = DKWindow::Create("DefaultWindow", 
@@ -30,42 +38,14 @@ public:
 		window->AddEventHandler(this,
 			DKFunction([this](const DKWindow::WindowEvent& e)
 			{
-				DKLog("WindowEvent: %d, origin:(%.1f, %.1f), size:(%.1f x %.1f), content:(%.1f, %.1f), scale:%f",
-					  e.type,
-					  e.windowRect.origin.x, e.windowRect.origin.y,
-					  e.windowRect.size.width, e.windowRect.size.height,
-					  e.contentRect.size.width, e.contentRect.size.height,
-					  e.contentScaleFactor);
 				if (e.type == DKWindow::WindowEvent::WindowClosed)
 					DKApplication::Instance()->Terminate(0);
 			}),
 			DKFunction([this](const DKWindow::KeyboardEvent& e)
 			{
-				if (e.type == DKWindow::KeyboardEvent::KeyUp)
-				{
-					if (e.key == DKVK_ENTER || e.key == DKVK_RETURN)
-					{
-						window->SetTextInputEnabled(0, !window->IsTextInputEnabled(0));
-						DKLog("TextInput: %d", window->IsTextInputEnabled(0));
-					}
-					else if (e.key == DKVK_ESCAPE)
-					{
-						window->HoldMouse(0, !window->IsMouseHeld(0));
-						DKLog("HoldMouse: %d", window->IsMouseHeld(0));
-					}
-				}
-				DKLog("KeyboardEvent: %d, %ls, %ls",
-					  e.type,
-					  (const wchar_t*)DKWindow::GetVKName(e.key),
-					  (const wchar_t*)e.text);
 			}),
 			DKFunction([this](const DKWindow::MouseEvent& e)
 			{
-				if (e.type != DKWindow::MouseEvent::Move || window->IsMouseHeld(0))
-				{
-					DKLog("MouseEvent: %d, btn:%d, location:%.1f, %.1f, delta:%.1f, %.1f",
-						e.type, e.buttonId, e.location.x, e.location.y, e.delta.x, e.delta.y);
-				}
 			})
 		);
 	}