mirror of
https://github.com/hyprwm/Hyprland
synced 2024-12-23 10:49:52 +01:00
data-device: minor fixes
send leave after drop, improve checks in completeDrag
This commit is contained in:
parent
785d062887
commit
a9c7a0830f
1 changed files with 7 additions and 7 deletions
|
@ -540,7 +540,7 @@ void CWLDataDeviceProtocol::initiateDrag(WP<CWLDataSourceResource> currentSource
|
|||
}
|
||||
|
||||
void CWLDataDeviceProtocol::updateDrag() {
|
||||
if (!dnd.currentSource)
|
||||
if (!dndActive())
|
||||
return;
|
||||
|
||||
if (dnd.focusedDevice)
|
||||
|
@ -595,15 +595,13 @@ void CWLDataDeviceProtocol::dropDrag() {
|
|||
}
|
||||
|
||||
dnd.focusedDevice->sendDrop();
|
||||
dnd.focusedDevice->sendLeave();
|
||||
|
||||
resetDndState();
|
||||
|
||||
if (dnd.overriddenCursor)
|
||||
g_pInputManager->unsetCursorImage();
|
||||
dnd.overriddenCursor = false;
|
||||
|
||||
g_pInputManager->simulateMouseMovement();
|
||||
g_pSeatManager->resendEnterEvents();
|
||||
}
|
||||
|
||||
bool CWLDataDeviceProtocol::wasDragSuccessful() {
|
||||
|
@ -624,11 +622,13 @@ bool CWLDataDeviceProtocol::wasDragSuccessful() {
|
|||
void CWLDataDeviceProtocol::completeDrag() {
|
||||
resetDndState();
|
||||
|
||||
if (!dnd.focusedDevice || !dnd.currentSource)
|
||||
if (!dnd.focusedDevice && !dnd.currentSource)
|
||||
return;
|
||||
|
||||
if (dnd.currentSource) {
|
||||
dnd.currentSource->sendDndDropPerformed();
|
||||
dnd.currentSource->sendDndFinished();
|
||||
}
|
||||
|
||||
dnd.focusedDevice.reset();
|
||||
dnd.currentSource.reset();
|
||||
|
|
Loading…
Reference in a new issue