Skip to content

Refactor drag and drop #2667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pandinocoder merged 16 commits into from
Mar 15, 2025
Merged

Refactor drag and drop #2667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8d9b65a
deactivating old drag and drop and starting to using native
WeylonSantana Mar 13, 2025
e33fad4
added drag and drop logic on slot items
WeylonSantana Mar 13, 2025
b5a4cd3
dont interact when is dragging
WeylonSantana Mar 13, 2025
01a76a2
expose icon image
WeylonSantana Mar 13, 2025
6dc060c
dont let player do some actions when is dragging
WeylonSantana Mar 13, 2025
aba53d5
hide details when dragging slot items
WeylonSantana Mar 13, 2025
5cdbf96
trying to block user input on root
WeylonSantana Mar 15, 2025
a673a7f
IconImage => Icon
WeylonSantana Mar 15, 2025
c761987
_descWindow => _descriptionWindow
WeylonSantana Mar 15, 2025
63ffb04
cleanup drag and drop handle drop
WeylonSantana Mar 15, 2025
f54e409
Globals.ContentManager? => GameContentManager.Current
WeylonSantana Mar 15, 2025
e885719
add buy item when dragging from shop to inventory
WeylonSantana Mar 15, 2025
62e3ebb
refactor the core of system with correct data/type
WeylonSantana Mar 15, 2025
46fdea8
more cleaning and refactor
WeylonSantana Mar 15, 2025
1d31084
small tweaks
WeylonSantana Mar 15, 2025
5cba827
fix guild bank not swapping for guildless user
WeylonSantana Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion Intersect.Client.Core/Core/Input.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Intersect.Client.Entities;
using Intersect.Client.Framework.GenericClasses;
using Intersect.Client.Framework.Graphics;
using Intersect.Client.Framework.Gwen.DragDrop;
using Intersect.Client.Framework.Gwen.Input;
using Intersect.Client.Framework.Input;
using Intersect.Client.General;
Expand Down Expand Up @@ -138,6 +139,11 @@ public static void OnKeyPressed(Keys modifier, Keys key)
return;
}

if (DragAndDrop.IsDragging)
{
return;
}

var gameUi = Interface.Interface.GameUi;

// First try and unfocus chat then close all UI elements, then untarget our target.. and THEN open the escape menu.
Expand Down Expand Up @@ -196,7 +202,7 @@ public static void OnKeyPressed(Keys modifier, Keys key)
break;

case Control.ToggleGui:
if (currentGameState == GameStates.InGame)
if (currentGameState == GameStates.InGame && !DragAndDrop.IsDragging)
{
Interface.Interface.HideUi = !Interface.Interface.HideUi;
}
Expand Down Expand Up @@ -249,6 +255,11 @@ public static void OnKeyPressed(Keys modifier, Keys key)
break;
}

if (DragAndDrop.IsDragging)
{
break;
}

switch (control)
{
case Control.Block:
Expand Down
Loading
Loading