Commit Graph

42 Commits

Author SHA1 Message Date
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
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
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
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
stefnotch
8f8f0266ce Add DpiScale to RootWindow 2021-02-08 09:48:57 +01:00
stefnotch
f5b48e03e9 Per window DPI 2021-02-07 17:26:41 +01:00
Wojtek Figat
ca6afc0c2d Fix HorizontalPanel and VerticalPanel auto-sizing if child control is using anchors
Fixes #203
2021-02-07 16:49:44 +01:00
Wojtek Figat
e3142e6408 Fix updating input fields on editing end without changes
Fixes #197
2021-02-03 22:34:11 +01:00
Wojtek Figat
a572e581e5 Fix HorizontalPanel children layout
Fixes 191
2021-02-03 21:30:33 +01:00
Wojtek Figat
c3b36062ed Fix error 2021-02-03 19:24:47 +01:00
Wojtek Figat
8180877269 Add support for copy/paste/rever values for groups in Custom Editor (eg. array editor) 2021-01-26 12:52:03 +01:00
stefnotch
5679d86683 Fix tracking mouse offset on high DPI screens 2021-01-12 12:04:30 +01:00
Wojtek Figat
fb84aa2c4b Merge branch 'typo-fix' of git://github.com/W2Wizard/FlaxEngine into W2Wizard-typo-fix 2021-01-11 15:34:41 +01:00
Wojtek Figat
ba1a246a90 Merge branch 'typo-fix' of git://github.com/VNNCC/FlaxEngine into VNNCC-typo-fix 2021-01-11 15:33:45 +01:00
Wojtek Figat
698cfd0c0a Fix BlurPanel crashes due to slider for BlurStrength 2021-01-09 18:09:39 +01:00
W2.Wizard
4d8cc9aef7 Fixed additional typos
Went through the source with VNNCC to correct as many found typos as possible

Co-Authored-By: VNC <52937757+VNNCC@users.noreply.github.com>
2021-01-05 02:14:21 +01:00
VNC
6ab300025b Fixed a ton of typos 2021-01-05 02:13:15 +01:00
Wojtek Figat
bf9204f146 Add IconsScale to editor interface options 2021-01-03 22:13:31 +01:00
Wojtek Figat
add539392a Merge branch 'IconScaling' of git://github.com/DaveTheGameDev/FlaxEngine into DaveTheGameDev-IconScaling 2021-01-03 21:06:25 +01:00
Jean-Baptiste Perrier
03eb39afe6 Bumping all copyright headers to 2021. 2021-01-02 14:28:49 +01:00
stefnotch
65ab9cac50 Change ClientFrom/ToScreen to PointFrom/ToScreen
Fix #67
2020-12-29 18:10:26 +01:00
David Conway
c0cc89201e Move icon settings to styles 2020-12-24 20:04:43 +11:00
Jean-Baptiste Perrier
39491663ee Fix flashing tooltip. 2020-12-21 17:25:10 +01:00
Wojtek Figat
6fb9eee74c You're breathtaking! 2020-12-07 23:40:54 +01:00