Skip to content

fix: Add mouse wheel delta to virtual button #2946

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
Eideren merged 14 commits into from
Oct 27, 2025
Merged

fix: Add mouse wheel delta to virtual button #2946

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
810b9da
fix: Add null check for IsPrimitiveType to prevent crash when selecti…
Acissathar Sep 30, 2025
5b14803
Move null check to callsite
Acissathar Sep 30, 2025
218c40e
Squash: Fix gamestudio crash when selecting multiple entities
Acissathar Oct 6, 2025
9e5904c
Squash: Add Yes and No to all for multiple asset import
Acissathar Oct 6, 2025
60109bf
Merge branch 'master' into experimental
Acissathar Oct 13, 2025
ccd7f91
Modify check to use the NodePresenter.Type if NodePresenter.Value is …
Acissathar Oct 15, 2025
ded1a96
Merge branch 'fix-gamestudio-crash-multiple-entities-null-type' into …
Acissathar Oct 15, 2025
af009c5
Merge fix: Int2-3 Equality using MathF and tolerance (#2934)
Acissathar Oct 16, 2025
58594da
Squash: Add Yes and No to all for multiple asset import
Acissathar Oct 6, 2025
81865f1
fix: Add null check for IsPrimitiveType to prevent crash when selecti…
Acissathar Sep 30, 2025
fa5ca8b
Move null check to callsite
Acissathar Sep 30, 2025
1df6ef4
Merge branch 'experimental' of https://github.com/Acissathar/stride i…
Acissathar Oct 19, 2025
65d6b66
fix: Add Mouse Wheel Delta to VirtualButton.Mouse
Acissathar Oct 22, 2025
7223407
Revert "Squash: Add Yes and No to all for multiple asset import"
Acissathar Oct 23, 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
91 changes: 71 additions & 20 deletions sources/editor/Stride.Core.Assets.Editor/ViewModel/AssetCollectionViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
using Stride.Core.Presentation.Services;
using Stride.Core.Translation;
using Stride.Core.Presentation.ViewModels;
using System.Collections;
using Stride.Core.Presentation.Windows;

namespace Stride.Core.Assets.Editor.ViewModel
{
Expand Down Expand Up @@ -554,15 +554,16 @@ private async Task<string> GetAssetCopyDirectory(DirectoryBaseViewModel director
var path = directory.Path;
var message = Tr._p("Message", "Do you want to place the resource in the default location ?");
var finalPath = Path.GetFullPath(Path.Combine(directory.Package.Package.ResourceFolders[0], path, file.GetFileName()));

var pathResult = await Dialogs.MessageBoxAsync(message, MessageBoxButton.YesNo, MessageBoxImage.Question);
if (pathResult == MessageBoxResult.No)
{
while (true)
{
var filePath = await Dialogs.SaveFilePickerAsync(
Path.GetFullPath(directory.Package.Package.ResourceFolders[0].FullPath),
[new FilePickerFilter("") { Patterns = [file.GetFileExtension()]}],
defaultFileName: file.GetFileName());
var filePath = await Dialogs.SaveFilePickerAsync(
Path.GetFullPath(directory.Package.Package.ResourceFolders[0].FullPath),
[new FilePickerFilter("") { Patterns = [file.GetFileExtension()] }],
defaultFileName: file.GetFileName());

// If the user closes the dialog, assume that they want to use the default directory
if (filePath is null)
Expand All @@ -582,12 +583,42 @@ [new FilePickerFilter("") { Patterns = [file.GetFileExtension()]}],
await Dialogs.MessageBoxAsync(message, MessageBoxButton.OK, MessageBoxImage.Error);
}
}

return finalPath;
}

private async Task<List<AssetViewModel>> InvokeAddAssetTemplate(LoggerResult logger, string name, DirectoryBaseViewModel directory, TemplateAssetDescription templateDescription, [CanBeNull] IList<UFile> files, PropertyContainer? customParameters)
{
List<AssetViewModel> newAssets = new List<AssetViewModel>();
IReadOnlyList<DialogButtonInfo> copyPromptButtons = DialogHelper.CreateButtons(files is not null && files.Count > 1 ?
[
Tr._p("Button", "Yes"),
Tr._p("Button", "No"),
Tr._p("Button", "Yes to all"),
Tr._p("Button", "No to all")
]
:
[
Tr._p("Button", "Yes"),
Tr._p("Button", "No")
], 1, 2);

IReadOnlyList<DialogButtonInfo> overwritePromptButtons = DialogHelper.CreateButtons(files is not null && files.Count > 1 ?
[
Tr._p("Button", "Yes"),
Tr._p("Button", "No"),
Tr._p("Button", "Yes to all")
]
:
[
Tr._p("Button", "Yes"),
Tr._p("Button", "No")
], 1, 2);

bool yesToAll = false;
bool overwriteAll = false;
string finalPath = string.Empty;

if (files is not null)
{
for (int i = 0; i < files.Count; i++)
Expand All @@ -598,28 +629,48 @@ private async Task<List<AssetViewModel>> InvokeAddAssetTemplate(LoggerResult log
if (inResourceFolder)
continue;

var message = Tr._p("Message", "Source file '{0}' is not inside of your project's resource folders, do you want to copy it?").ToFormat(file.FullPath);
if (!yesToAll)
{
var message = Tr._p("Message", "Source file '{0}' is not inside of your project's resource folders, do you want to copy it?").ToFormat(file.FullPath);

var copyResult = await Dialogs.MessageBoxAsync(message, MessageBoxButton.YesNo, MessageBoxImage.Warning);
var copyResult = await Dialogs.MessageBoxAsync(message, copyPromptButtons, MessageBoxImage.Warning);

if (copyResult != MessageBoxResult.Yes)
continue;
yesToAll = copyResult is 3;

string finalPath = await GetAssetCopyDirectory(directory, file);
// If no or close, skip this file
if (copyResult is 0 or 2)
continue;

// If "No to all", abort the entire copy process
if (copyResult is 4)
break;

finalPath = await GetAssetCopyDirectory(directory, file);
}
else
{
// If "Yes to all" we're going to assume they want to use the same directory as the initial file.
finalPath = Path.Combine(Path.GetDirectoryName(finalPath), file.GetFileName());
}

try
{
Directory.CreateDirectory(Path.GetDirectoryName(finalPath));
if (File.Exists(finalPath))
{
message = Tr._p("Message", "The file '{0}' already exists, it will get overwritten if you continue, do you really want to proceed?").ToFormat(finalPath);
if (!overwriteAll)
{
var message = Tr._p("Message", "The file '{0}' already exists, it will get overwritten if you continue, do you really want to proceed?").ToFormat(finalPath);

copyResult = await Dialogs.MessageBoxAsync(message, MessageBoxButton.YesNo, MessageBoxImage.Warning);
var copyResult = await Dialogs.MessageBoxAsync(message, overwritePromptButtons, MessageBoxImage.Warning);

// Abort if the user says no or closes the prompt
if (copyResult != MessageBoxResult.Yes)
{
return newAssets;
overwriteAll = copyResult is 3;

// Abort if the user says no or closes the prompt
if (copyResult is 0 or 2)
{
return newAssets;
}
}
File.Copy(file.FullPath, finalPath, true);
}
Expand All @@ -632,7 +683,7 @@ private async Task<List<AssetViewModel>> InvokeAddAssetTemplate(LoggerResult log
}
catch (Exception ex)
{
message = Tr._p("Message", $"An error occurred while copying the asset to the resources folder : {ex.Message}");
var message = Tr._p("Message", $"An error occurred while copying the asset to the resources folder : {ex.Message}");
await Dialogs.MessageBoxAsync(message, MessageBoxButton.OK, MessageBoxImage.Error);
return newAssets;
}
Expand Down Expand Up @@ -1154,11 +1205,11 @@ private void SaveAssetFilters()
{
if (filter.IsReadOnly)
continue; // Skip engine defined filters

AssetFilterViewModelData obj = new AssetFilterViewModelData
{
DisplayName = filter.DisplayName,
Filter = filter.Filter,
DisplayName = filter.DisplayName,
Filter = filter.Filter,
IsActive = filter.IsActive,
category = filter.Category
};
Expand Down
7 changes: 7 additions & 0 deletions sources/engine/Stride.Input/VirtualButton/VirtualButton.Mouse.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,11 @@ protected Mouse(string name, int id, bool isPositiveAndNegative)
/// </summary>
public static readonly Mouse DeltaY = new Mouse("DeltaY", 8, true);

/// <summary>
/// Equivalent to <see cref="InputManager.MouseWheelDelta"/>.
/// </summary>
public static readonly Mouse WheelDelta = new Mouse("WheelDelta", 9, true);

public override float GetValue(InputManager manager)
{
if (Index < 5)
Expand All @@ -81,6 +86,8 @@ public override float GetValue(InputManager manager)
return manager.MouseDelta.X;
case 8:
return manager.MouseDelta.Y;
case 9:
return manager.MouseWheelDelta;
}
}

Expand Down