Commit Graph

220 Commits

Author SHA1 Message Date
Wojtek Figat
74758f5380 Merge remote-tracking branch 'origin/master' into 1.6
# Conflicts:
#	Source/Tools/Flax.Build/Build/Builder.Projects.cs
#	Source/Tools/Flax.Build/Build/Plugins/NetworkingPlugin.cs
2023-03-14 11:52:41 +01:00
Wojtek Figat
d2a0438b71 Fix error on control reorder while it got remove before 2023-03-13 20:06:45 +01:00
Wojtek Figat
0112f70c05 Merge remote-tracking branch 'origin/master' into dotnet7 2023-03-01 19:50:22 +01:00
Chandler Cox
037ad94ae7 Small Fix 2023-02-22 17:37:03 -06:00
Chandler Cox
34aff4a2b6 Added a change cursor boolean to TextBoxBase and made it so the cursor changes to default when hovering over the cancel button. 2023-02-22 17:34:33 -06:00
Wojtek Figat
0cf40729fa Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-19 15:04:02 +01:00
Wojtek Figat
8327866205 Expose ScrollSpeedWheel and ScrollSpeedClick for scroll bar editing
#946
2023-02-18 17:05:41 +01:00
PrecisionRender
f0061e07b4 Update scroll speed to feel less sluggish 2023-02-18 09:29:01 -06:00
Wojtek Figat
2f97db306a Merge branch 'context_menu_focus_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-context_menu_focus_fixes 2023-02-17 20:27:47 +01:00
Wojtek Figat
ac59cc4633 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-13 10:05:51 +01:00
e3a96fa724 Fix tooltip not hiding after clicking on TreeNode 2023-02-12 14:32:28 +02:00
Wojtek Figat
9c98d9d01e Fix focus when using CanvasScaler 2023-02-10 16:31:06 +01:00
Wojtek Figat
c99525131a Fix build d09dfd1f61 2023-02-08 23:31:23 +01:00
Wojtek Figat
d09dfd1f61 Add **Canvas Scaler** control for resolution-independent UI
#448 #525
2023-02-08 19:51:16 +01:00
Wojtek Figat
0366de36ce Add BlurScaleWithSize to BlurPanel for resolution-independent blur 2023-02-07 14:13:02 +01:00
Wojtek Figat
0270772463 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-06 10:02:13 +01:00
Chandler Cox
2592841793 Code style cleanup 2023-02-01 18:28:00 -06:00
Chandler Cox
b862126209 Changed to only show ibeam when editing 2023-02-01 18:25:40 -06:00
Chandler Cox
ade0450c0e Add cursor to change to Ibeam in text boxes. 2023-02-01 09:32:58 -06:00
Wojtek Figat
e779c3ca17 Merge commit '997baa3b774ac4dea739e15a55070519b0863afc' into dotnet7 2023-01-25 20:13:34 +01:00
Wojtek Figat
6931161dce Merge branch 'add-arrow-to-groups' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-arrow-to-groups 2023-01-24 19:41:37 +01:00
Chandler Cox
66fd5e716c various fixes and improvements. size changes for headers, deactivate containement for collections. 2023-01-21 13:35:51 -06:00
Wojciech Figat
7b20bc38a4 Merge branch '1.5' into dotnet7
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
2023-01-17 11:52:52 +01:00
Wojciech Figat
fc65e5a7a6 Fix leftover UI control state when it gets disabled/hidden/reparented 2023-01-16 15:08:57 +01:00
Wojciech Figat
eebc4951de Merge branch '1.5' into dotnet7
# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs
2023-01-10 15:49:44 +01:00
Wojciech Figat
9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
Wojtek Figat
c48a81a068 Merge branch '1.5' into dotnet7
# Conflicts:
#	Source/Editor/Managed/ManagedEditor.Internal.cpp
#	Source/Engine/Core/Config/LayersAndTagsSettings.cs
2022-12-28 18:49:14 +01:00
Wojtek Figat
6b0ead59d2 Fix code style 2022-12-27 20:24:01 +01:00
Wojtek Figat
1d359d9ed2 Merge branch 'add-button-hover-events' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-button-hover-events 2022-12-27 20:23:04 +01:00
Wojtek Figat
cb6590e7ef Format code 2022-12-27 18:50:08 +01:00
e03a819176 Replace usage of Utils.ExtractArrayFromList with Span 2022-12-22 19:54:59 +02:00
Chandler Cox
a468053f46 Added hover begin and end event to button 2022-12-15 21:09:34 -06:00
Chandler Cox
1a3bcc5d27 Changed default to true. 2022-12-08 16:21:10 -06:00
Chandler Cox
f81740f28c Merge branch 'click-to-submit-text' of https://github.com/Tryibion/FlaxEngine into click-to-submit-text 2022-12-08 08:33:09 -06:00
Chandler Cox
eab775b9a2 Added RstoreTextFromStart function and changed the calls. Renamed bool. 2022-12-08 08:02:57 -06:00
Chandler Cox
9b82860154 Allows user to left click to end editing text and right click to change text back to its original and end editing. 2022-12-08 08:02:57 -06:00
Chandler Cox
93a0facd93 Allows user to left click to end editing text and right click to change text back to its original and end editing. 2022-11-29 21:30:17 -06:00
Wojtek Figat
e713273942 Fix textbox defocus on edit end
#789
2022-11-24 21:54:54 +01:00
Wojtek Figat
c5d1897acf Rename CanScrollMultilineText to IsMultilineScrollable to match the other properties naming
#818
2022-11-21 16:10:53 +01:00
Chandler Cox
c817b63927 made it easier to scroll and resize the material source window. and added the ability to change if the text can be scrolled in the text box 2022-11-04 10:53:29 -05:00
Wojtek Figat
ccd830a270 Merge branch 'better-tool-tip-hide-on-drag' of https://github.com/Tryibion/FlaxEngine into Tryibion-better-tool-tip-hide-on-drag 2022-10-29 19:34:02 +02:00
Wojtek Figat
7ddc1a1553 Code style fix 2022-10-29 19:05:35 +02:00
Chandler Cox
2297ba3c86 moved where hiding the tooltip is called when starting to drag for better response 2022-10-25 16:38:23 -05:00
Chandler Cox
a79b642613 Added KeyUp event in TextBoxBase 2022-10-24 14:11:34 -05:00
Chandler Cox
616379c54b Added an event to subscribe to in TextBoxBase that gets fired when a key is down. 2022-10-24 14:00:56 -05:00
Wojtek Figat
ebd88a407d Fix mouse leave event handling to restore cursor
#759
2022-10-10 18:47:38 +02:00
Wojtek Figat
0ed41f97fc Merge branch 'cursor-changes' of https://github.com/Tryibion/FlaxEngine into Tryibion-cursor-changes 2022-10-10 18:33:29 +02:00
Chandler Cox
6d6961d961 removed mouse button down as it caused issues with focus 2022-10-06 19:59:51 -05:00
Chandler Cox
091fe0a40a Simplified tool tip hide 2022-10-06 19:12:46 -05:00
Chandler Cox
2d42ca522d Fixed spacing and comment 2022-10-06 16:51:25 -05:00