Commit Graph

178 Commits

Author SHA1 Message Date
Wojtek Figat
abe635ad9b Fix exception in Custom Editors UI due to invalid reference value processing
#325
2021-03-18 15:12:25 +01:00
Wojtek Figat
960a122550 Revert children clipping to be called outside DrawChildren (regression from #355) 2021-03-18 14:26:00 +01:00
Wojtek Figat
5c171c8b58 Fix control Offsets updating for control bounds when changing anchors
#312
2021-03-18 13:16:17 +01:00
Wojtek Figat
6a6eb96793 Fix code style 2021-03-18 11:15:27 +01:00
Wojtek Figat
8078b9543d Merge branch 'ui' of git://github.com/jb-perrier/FlaxEngine into jb-perrier-ui 2021-03-18 11:09:28 +01:00
Wojtek Figat
845da14e6a Fix UIControl setup on IsActive changes
#326
2021-03-18 10:56:48 +01:00
Jean-Baptiste Perrier
c8b57d417c Convert Control to ContainerControl. 2021-03-17 20:53:42 +01:00
Jean-Baptiste Perrier
fb70368c8d Fix image ordering. 2021-03-17 20:22:27 +01:00
Jean-Baptiste Perrier
5af3a22fd0 Add DrawSelf. 2021-03-17 20:22:06 +01:00
Wojtek Figat
df497bf684 Fix UIControl invalid showing in prefab window using nested prefab with UI 2021-03-17 19:25:12 +01:00
Wojtek Figat
960268f756 Fix UICanvas state synchronization when working with prefabs 2021-03-17 19:23:54 +01:00
Wojtek Figat
518df5e62b Add skipping textbox scrolling if it has no selection 2021-03-17 13:44:38 +01:00
Wojtek Figat
e6d3242670 Fix invalid UIControl event blocking for prefab editor 2021-03-17 11:58:26 +01:00
Wojtek Figat
2a2d9f54de Fix UIControl location deserialization when using prefabs and anchors
#218
2021-03-17 11:55:17 +01:00
Wojtek Figat
0122bf68bf Fix skipping UICanvas diff serialization for Size property if render mode is ScreenSpace 2021-03-17 11:54:36 +01:00
Wojtek Figat
8fb27e6f83 Fix missing UICanvas linkage in prefab preview
#218
2021-03-17 11:12:08 +01:00
Wojtek Figat
4eeadf87fb Fix warning 2021-03-17 10:28:14 +01:00
Wojtek Figat
691df4cb80 Fix Dpi issues when RootWindow is null
Fix #344
2021-03-17 00:04:16 +01:00
Wojtek Figat
878fee505f Fix updating UI layout after changing control order 2021-03-16 23:38:56 +01:00
stefnotch
b151ab497f Fix UICanvas high DPI issues 2021-03-15 17:30:35 +01:00
stefnotch
85ab871d48 Call the correct DPI getter
See also https://github.com/FlaxEngine/FlaxEngine/pull/267
2021-03-15 15:40:32 +01:00
Wojtek Figat
9ed0138a17 Fix crash on using Space char in font with no font atlases initialized 2021-03-14 19:01:42 +01:00
Wojtek Figat
544a043c56 Fix crash for empty text in Text Render
Fixes #327
2021-03-12 15:33:09 +01:00
Wojtek Figat
a2be4bb74a Fix deserialization of UTF-8 string for C# object properties
Closes #320
2021-03-12 13:50:03 +01:00
Wojtek Figat
84265322d5 Post merge fixes, tweaks, cleanup and improvements 2021-03-08 22:30:49 +01:00
Wojtek Figat
d06433deed Merge branch 'better-uicontrol-editor' of git://github.com/honzapatCZ/FlaxEngine into honzapatCZ-better-uicontrol-editor 2021-03-08 22:01:30 +01:00
Wojtek Figat
b7814e119b Merge branch 'label_text_clip_margin_fix' of git://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-label_text_clip_margin_fix 2021-03-08 21:53:35 +01:00
Wojtek Figat
0db1f5e965 Fix selection in high dpi 2021-03-08 20:57:35 +01:00
Wojtek Figat
fcc0ca1772 Merge branch 'textbox_dpi_fix' of git://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-textbox_dpi_fix 2021-03-08 20:52:12 +01:00
Wojtek Figat
81f3a65a5f Merge branch 'fix-per-window-dpi' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-per-window-dpi
# Conflicts:
#	Source/Editor/Utilities/Utils.cs
#	Source/Editor/Windows/Assets/MaterialWindow.cs
#	Source/Editor/Windows/Assets/ParticleEmitterWindow.cs
#	Source/Engine/Platform/Linux/LinuxWindow.cpp
#	Source/Engine/Platform/Windows/WindowsWindow.cpp
2021-03-08 20:50:31 +01:00
Wojtek Figat
77b21de534 Fix UTF-8 and UTF-16 encoding support usage in Json resources
Closes #310
Closes #27
2021-03-07 21:30:01 +01:00
GoaLitiuM
4795ffdf3d Fix text not getting clipped in Label with negative margins 2021-03-07 15:45:34 +02:00
honzapatCZ
2e687edd99 ui editor 2021-03-06 15:09:45 +01:00
Wojtek Figat
4d73b271b8 Fix some minor issues with materials previews in Editor 2021-02-25 16:38:05 +01:00
Wojtek Figat
5a9ca6f130 Merge remote-tracking branch 'origin/1.1' into linux-editor
# Conflicts:
#	Source/Engine/Core/Math/BoundingSphere.cs
#	Source/Engine/Debug/DebugDraw.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
#	Source/Engine/Platform/Win32/Win32Platform.h
2021-02-23 22:32:17 +01:00
Wojtek Figat
cf3ac7a26e Merge remote-tracking branch 'origin/master' into linux-editor
# Conflicts:
#	Source/Engine/Core/Math/Color.cs
#	Source/Engine/Navigation/Navigation.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
2021-02-23 22:29:07 +01:00
Wojtek Figat
3ddd64df2a Add support for drawing SpriteHandle in Sprite Render 2021-02-23 13:57:51 +01:00
Wojtek Figat
19c83e3b6e Add Sprite Render actor for sprites drawing 2021-02-23 13:23:22 +01:00
stefnotch
0a9e9e6695 Address review comments 2021-02-21 20:50:21 +01:00
GoaLitiuM
cfb02692df Fix TextBox caret and selection size with custom DPI 2021-02-21 16:05:37 +02:00
Wojtek Figat
12c503646d Add more separators to TextBoxBase 2021-02-21 15:00:45 +01:00
W2.Wizard
68f6e0251c Cleanup 8 2021-02-21 14:27:44 +01:00
W2.Wizard
694b20148d Cleanup 5 2021-02-21 11:50:30 +01:00
W2.Wizard
20ba37e223 Cleanup 3 2021-02-21 11:09:04 +01:00
W2.Wizard
52bc268ee7 Cleanup 1 2021-02-21 10:05:47 +01:00
Ari Vuollet
e2590b5f11 Allow overriding most of the methods in TextBoxBase 2021-02-20 23:07:21 +02:00
Wojtek Figat
9f80b9853c Merge remote-tracking branch 'origin/master' into 1.1 2021-02-19 12:31:58 +01:00
Jean-Baptiste Perrier
1c1e9bb105 Fix re-drawing the background when alpha > 0 . 2021-02-17 12:44:44 +01:00
Wojtek Figat
c9ea812a24 Optimize DrawCall to pack indirect draw arg and graphics draw data with union 2021-02-15 11:52:06 +01:00
Wojtek Figat
312e4ad010 Merge branch 'master' into 1.1
# Conflicts:
#	Source/Engine/Content/JsonAsset.h
#	Source/Engine/Core/Config/Settings.h
2021-02-15 10:40:59 +01:00