GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,506 Commits 14 Branches 0 Tags
df1dfbec36446ea89eb3f8fdfd055256969b3f86
Commit Graph

83 Commits

Author SHA1 Message Date
Wojtek Figat
35f06bbf6e Fix using TextBoxBase with child controls 
(cherry picked from commit 2b41c8d24f)
 2021-04-27 16:50:34 +02:00
Wojtek Figat
b73ff9aaf6 Merge branch '1.1' into 1.2 
# Conflicts:
#	Source/Platforms/DotNet/Newtonsoft.Json.dll
#	Source/Platforms/DotNet/Newtonsoft.Json.pdb
#	Source/Platforms/UWP/Binaries/Newtonsoft.Json.dll
#	Source/Platforms/XboxOne/Binaries/Newtonsoft.Json.dll
 2021-04-24 12:32:17 +02:00
Wojtek Figat
6821e3c370 Fix progress bar drawing precision and stability 
#471
 2021-04-22 19:25:01 +02:00
Tayler Mauk
3410bd5380 Standardize variable names 2021-04-20 22:31:15 -07:00
Tayler Mauk
dc0f77ae2a Fix issue #468 2021-04-20 22:24:37 -07:00
Tayler Mauk
3e73f40c0f Fix issue #460 2021-04-20 21:23:42 -07:00
stefnotch
08d08133c1 GetChildAt should do it in reverse order to respect z order 2021-04-18 09:49:25 +02:00
Wojtek Figat
ac1eb8d58d Merge branch 'master' into 1.2 2021-04-13 09:52:03 +02:00
Wojtek Figat
7e622a69a6 Fix AutoFocus saved in data for controls 2021-04-07 20:53:18 +02:00
Wojtek Figat
6001eb88fa Fix Dropdown control 
#334
 2021-04-07 20:52:22 +02:00
honzapatCZ
ff4f1277e7 invert preserveBounds back 2021-04-07 11:45:12 +02:00
Nejcraft
6fba1a4ab9 Delete Control.Bounds.cs.rej 2021-04-07 11:22:45 +02:00
Nejcraft
f24cb34e3f Merge branch '1.2' into ui-achorpopup-shiftctrl-modes 2021-04-07 11:20:20 +02:00
Wojtek Figat
772af752d2 Fix regression from dff1374378 2021-04-07 11:10:51 +02:00
Wojtek Figat
dff1374378 Post-merge tweaks 
#417
 2021-04-07 10:57:17 +02:00
honzapatCZ
41a873450e should work now 2021-04-06 16:54:22 +02:00
honzapatCZ
c4dd5ef5c8 anchor preset popup shift + ctrl 2021-04-02 17:47:39 +02:00
honzapatCZ
73e92e33fd local positions 2021-04-02 17:38:30 +02:00
stefnotch
12fd7274a9 Fix DPI regression: use the overrideable RootWindow instead of _root 2021-03-29 10:54:48 +02:00
Wojtek Figat
9f79d0e3c4 Add support for vertical and horizontal panels to arrange children based on the child anchor 
#385
 2021-03-25 21:45:29 +01:00
Wojtek Figat
d3bdc3cf8b Fix UI not being updated with particular panels used when changing child control anchors 
#385
 2021-03-25 21:27:42 +01:00
Wojtek Figat
5c495b987b Add Shift+Home shortcut to Text Boxes 
#386
 2021-03-25 21:14:37 +01:00
Wojtek Figat
16f81cc184 Fix updating Label layout after font change when using automatic size 
#380
 2021-03-23 09:32:12 +01:00
Wojtek Figat
e8c9856665 Fix Vertical/Horizontal panels issue with anchored child controls 
#378
 2021-03-23 09:24:56 +01:00
Wojtek Figat
160dfa5dc7 Fix Label text alignment in auto size text 
#308
 2021-03-20 18:49:31 +01:00
Wojtek Figat
7dd67b5ae3 Fix Label auto-height and auto-width when text overflows the lines and it's wrapped 
#358
 2021-03-20 13:06:35 +01:00
Wojtek Figat
ac511cbadc Improve documentation comments for Control properties that are based on Pivot property 2021-03-18 16:34:54 +01:00
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
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
518df5e62b Add skipping textbox scrolling if it has no selection 2021-03-17 13:44:38 +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
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
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
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