Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
5,901 Commits 15 Branches 23 Tags
cd7ad4e5f855c66d261eeedc57770ff6cbca672c
Commit Graph

111 Commits

Author SHA1 Message Date
mafiesto4 b57a3165fa Fix textbox submit when it's nav focused 2023-06-16 10:56:17 +02:00
mafiesto4 694980160b Merge remote-tracking branch 'origin/master' into 1.6 
# Conflicts:
#	Source/Editor/CustomEditors/CustomEditorsUtil.cs
#	Source/Engine/Networking/NetworkReplicator.cpp
#	Source/Engine/Scripting/ManagedCLR/MUtils.cpp
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
 2023-05-24 23:28:38 +02:00
mafiesto4 3fa9f9e9cf Follow up 4482fc0bcf 
#1086
 2023-05-16 12:14:52 +02:00
mafiesto4 73ee5676c6 Merge branch 'scale-icon-change' of https://github.com/Menotdan/FlaxEngine into Menotdan-scale-icon-change 2023-05-16 12:01:10 +02:00
mafiesto4 b57018f55c Merge remote-tracking branch 'origin/master' into 1.6 2023-05-12 14:41:21 +02:00
mafiesto4 b5117af4b8 Format code 2023-05-12 14:19:40 +02:00
Tryibion eeaf7eb733 Move BoxSize 2023-05-10 08:04:47 -05:00
Tryibion 2b59cbf0f1 Organize the style groups of UI controls 2023-05-10 07:44:54 -05:00
Menotdan 681564189f Finish implementing IconButton and use that to create a more intuitive scale linking interface. 2023-05-08 00:42:38 -04:00
Menotdan 141555377b Begin working on an IconButton class, and demoing the IconButton idea using the scale link icon. 2023-05-07 22:58:57 -04:00
mafiesto4 0112f70c05 Merge remote-tracking branch 'origin/master' into dotnet7 2023-03-01 19:50:22 +01:00
Tryibion 037ad94ae7 Small Fix 2023-02-22 17:37:03 -06:00
Tryibion 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
mafiesto4 0270772463 Merge remote-tracking branch 'origin/master' into dotnet7 2023-02-06 10:02:13 +01:00
Tryibion 2592841793 Code style cleanup 2023-02-01 18:28:00 -06:00
Tryibion b862126209 Changed to only show ibeam when editing 2023-02-01 18:25:40 -06:00
Tryibion ade0450c0e Add cursor to change to Ibeam in text boxes. 2023-02-01 09:32:58 -06:00
mafiesto4 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
mafiesto4 fc65e5a7a6 Fix leftover UI control state when it gets disabled/hidden/reparented 2023-01-16 15:08:57 +01:00
mafiesto4 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
mafiesto4 9626e9bbb6 Update copyright year 2023-01-10 15:29:37 +01:00
mafiesto4 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
mafiesto4 6b0ead59d2 Fix code style 2022-12-27 20:24:01 +01:00
mafiesto4 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
mafiesto4 cb6590e7ef Format code 2022-12-27 18:50:08 +01:00
GoaLitiuM e03a819176 Replace usage of Utils.ExtractArrayFromList with Span 2022-12-22 19:54:59 +02:00
Tryibion a468053f46 Added hover begin and end event to button 2022-12-15 21:09:34 -06:00
Tryibion 1a3bcc5d27 Changed default to true. 2022-12-08 16:21:10 -06:00
Tryibion 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
Tryibion eab775b9a2 Added RstoreTextFromStart function and changed the calls. Renamed bool. 2022-12-08 08:02:57 -06:00
Tryibion 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
Tryibion 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
mafiesto4 e713273942 Fix textbox defocus on edit end 
#789
 2022-11-24 21:54:54 +01:00
mafiesto4 c5d1897acf Rename CanScrollMultilineText to IsMultilineScrollable to match the other properties naming 
#818
 2022-11-21 16:10:53 +01:00
Tryibion 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
mafiesto4 7ddc1a1553 Code style fix 2022-10-29 19:05:35 +02:00
Tryibion a79b642613 Added KeyUp event in TextBoxBase 2022-10-24 14:11:34 -05:00
Tryibion 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
mafiesto4 07b02e6cf3 Add option to disable selecting text in text box 
5dadaf70f9
 2022-08-08 13:51:55 +02:00
mafiesto4 183e87d147 Fix rich text box images from name in cooked build 2022-08-08 11:48:36 +02:00
mafiesto4 5dadaf70f9 Add option to disable selecting text in text box 2022-08-08 11:18:16 +02:00
mafiesto4 ad7a8e528a Fix tab navigation 2022-08-06 12:10:14 +02:00
mafiesto4 f781fd8ab6 Add horizontal alignment tags for rich text box 2022-08-05 15:29:37 +02:00
mafiesto4 9caf80bdc9 Add option to disable text clipping in text boxes 2022-08-05 14:38:18 +02:00
mafiesto4 4c280ef015 Fix drawing single character text format 2022-08-04 14:42:52 +02:00
mafiesto4 142d81065a Add text block alignment options for rich text box (and valign tag) 2022-08-04 13:52:25 +02:00
mafiesto4 3089cc3b59 Add img tag to rich text box 2022-08-04 12:43:16 +02:00
mafiesto4 4923d63a94 Add size tag 2022-08-03 15:41:25 +02:00
mafiesto4 6f18a8a3ff Add font tag 2022-08-03 14:39:00 +02:00
mafiesto4 8f895e54cd Improve rich text layout for lines with different fonts in line to match baseline 2022-08-03 12:58:23 +02:00