more editor fixes (#574)

Assets/Resources/Prefabs/Editor/SettingsMenu/GameSettings.prefab

@@ -349,15 +349,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -550,15 +552,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 1
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -685,15 +689,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -822,15 +828,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -1986,15 +1994,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -3061,15 +3071,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 1
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -3560,15 +3572,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -3922,10 +3936,13 @@ MonoBehaviour:
   m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
   m_OnFocusSelectAll: 1
   m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
   m_RestoreOriginalTextOnEscape: 1
   m_isRichTextEditingAllowed: 0
   m_LineLimit: 0
+  isAlert: 0
   m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &2413243360073305582
 GameObject:
   m_ObjectHideFlags: 0
@@ -4345,10 +4362,13 @@ MonoBehaviour:
   m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
   m_OnFocusSelectAll: 1
   m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
   m_RestoreOriginalTextOnEscape: 1
   m_isRichTextEditingAllowed: 0
   m_LineLimit: 0
+  isAlert: 0
   m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &2663069741382970651
 GameObject:
   m_ObjectHideFlags: 0
@@ -4533,10 +4553,13 @@ MonoBehaviour:
   m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
   m_OnFocusSelectAll: 1
   m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
   m_RestoreOriginalTextOnEscape: 1
   m_isRichTextEditingAllowed: 0
   m_LineLimit: 0
+  isAlert: 0
   m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &2663113318115009593
 GameObject:
   m_ObjectHideFlags: 0
@@ -5274,15 +5297,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -5690,15 +5715,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -5900,10 +5927,13 @@ MonoBehaviour:
   m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
   m_OnFocusSelectAll: 1
   m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
   m_RestoreOriginalTextOnEscape: 1
   m_isRichTextEditingAllowed: 0
   m_LineLimit: 0
+  isAlert: 0
   m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &3551385317041670879
 GameObject:
   m_ObjectHideFlags: 0
@@ -6093,15 +6123,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -6228,15 +6260,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 1
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -6517,15 +6551,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -6692,15 +6728,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -7895,15 +7933,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -8509,15 +8549,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -8645,15 +8687,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -9068,15 +9112,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -9203,15 +9249,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -9672,12 +9720,15 @@ MonoBehaviour:
   m_ItemText: {fileID: 8402981209467784936}
   m_ItemImage: {fileID: 0}
   m_Value: 0
+  m_MultiSelect: 0
   m_Options:
     m_Options:
     - m_Text: Dual
       m_Image: {fileID: 0}
+      m_Color: {r: 1, g: 1, b: 1, a: 1}
     - m_Text: Single
       m_Image: {fileID: 0}
+      m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls:
@@ -9803,15 +9854,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -10100,15 +10153,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -10457,15 +10512,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -10592,15 +10649,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -10803,15 +10862,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -10938,15 +10999,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -11260,15 +11323,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 1
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -12106,15 +12171,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 0
+  m_TextWrappingMode: 3
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 1
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -12588,10 +12655,13 @@ MonoBehaviour:
   m_GlobalFontAsset: {fileID: 11400000, guid: c2df694f599b22b42817910ff570a9df, type: 2}
   m_OnFocusSelectAll: 1
   m_ResetOnDeActivation: 1
+  m_KeepTextSelectionVisible: 0
   m_RestoreOriginalTextOnEscape: 1
   m_isRichTextEditingAllowed: 0
   m_LineLimit: 0
+  isAlert: 0
   m_InputValidator: {fileID: 0}
+  m_ShouldActivateOnSelect: 1
 --- !u!1 &7818140731132867041
 GameObject:
   m_ObjectHideFlags: 0
@@ -13063,6 +13133,7 @@ MonoBehaviour:
   m_ItemText: {fileID: 607737781079879371}
   m_ItemImage: {fileID: 0}
   m_Value: 0
+  m_MultiSelect: 0
   m_Options:
     m_Options: []
   m_OnValueChanged:
@@ -13181,15 +13252,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -13728,15 +13801,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0
@@ -13863,15 +13938,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 00000000
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0

Assets/Resources/Sprites/Editor/UI/icons.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b230d12951a959f40840eccb3dc8fc35
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas

@@ -0,0 +1,114 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!687078895 &4343727234628468602
+SpriteAtlas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: icons_atlas
+  m_EditorData:
+    serializedVersion: 2
+    textureSettings:
+      serializedVersion: 2
+      anisoLevel: 1
+      compressionQuality: 50
+      maxTextureSize: 2048
+      textureCompression: 0
+      filterMode: 1
+      generateMipMaps: 0
+      readable: 0
+      crunchedCompression: 0
+      sRGB: 1
+    platformSettings:
+    - serializedVersion: 3
+      m_BuildTarget: DefaultTexturePlatform
+      m_MaxTextureSize: 512
+      m_ResizeAlgorithm: 0
+      m_TextureFormat: -1
+      m_TextureCompression: 0
+      m_CompressionQuality: 50
+      m_CrunchedCompression: 0
+      m_AllowsAlphaSplitting: 0
+      m_Overridden: 0
+      m_AndroidETC2FallbackOverride: 0
+      m_ForceMaximumCompressionQuality_BC6H_BC7: 0
+    packingSettings:
+      serializedVersion: 2
+      padding: 4
+      blockOffset: 1
+      allowAlphaSplitting: 0
+      enableRotation: 0
+      enableTightPacking: 1
+      enableAlphaDilation: 0
+    secondaryTextureSettings: {}
+    variantMultiplier: 1
+    packables:
+    - {fileID: 102900000, guid: b230d12951a959f40840eccb3dc8fc35, type: 3}
+    bindAsDefault: 1
+    isAtlasV2: 0
+    cachedData: {fileID: 0}
+  m_MasterAtlas: {fileID: 0}
+  m_PackedSprites:
+  - {fileID: 21300000, guid: 49e59e302f4a24a4da56bd63185fcb01, type: 3}
+  - {fileID: 21300000, guid: 6f76ee0157ff5854295d8d0b12b5f165, type: 3}
+  - {fileID: 21300000, guid: 9ae7ecf2cc001d14595ec03e1d4d86a6, type: 3}
+  - {fileID: 21300000, guid: 6dd981c3e3319f243b56549e3f26fb72, type: 3}
+  - {fileID: 21300000, guid: 99dd78d3f365c0b498bc65b192951aa7, type: 3}
+  - {fileID: 21300000, guid: c158bbf3be7618c468e696e8c2c54e95, type: 3}
+  - {fileID: 21300000, guid: 348825b5c77b9d143961119fc008e631, type: 3}
+  - {fileID: 21300000, guid: 44c391c5df20f2844b9437c0f3138355, type: 3}
+  - {fileID: 21300000, guid: 4ea196d68cba90a4d8b08ad6fe012f49, type: 3}
+  - {fileID: 21300000, guid: 55bb46a7614176b4c941a5caf846f7e8, type: 3}
+  - {fileID: 21300000, guid: 57971d0838f02124080be29466f8f638, type: 3}
+  - {fileID: 21300000, guid: e85d5d286a8191b499c570d33dd0899c, type: 3}
+  - {fileID: 21300000, guid: 39656548c069d5541a9d9d1a808a76e4, type: 3}
+  - {fileID: 21300000, guid: 21da6678ec5624a439f87f3487819ac0, type: 3}
+  - {fileID: 21300000, guid: b7a1fac8b59b4d14289fa198206ef47e, type: 3}
+  - {fileID: 21300000, guid: 6e7b88d9d62ed1b429c63b83745e3672, type: 3}
+  - {fileID: 21300000, guid: dd516f1a3380ca642939d4fa86603249, type: 3}
+  - {fileID: 21300000, guid: e63dfe3b432d7404bab9ef307426a0bf, type: 3}
+  - {fileID: 21300000, guid: 1256a95b617ffc0458b3aec7fba83afe, type: 3}
+  - {fileID: 21300000, guid: ba34210de39bafc4d9bc0bb9163d83c7, type: 3}
+  - {fileID: 21300000, guid: 5562630d3cb1e1b439e6f0d06c45b14a, type: 3}
+  - {fileID: 21300000, guid: 05e0181d5d7f7144f9263d1ccca41112, type: 3}
+  - {fileID: 21300000, guid: 8dce25bd7de8cb7409d9043e6735bda5, type: 3}
+  - {fileID: 21300000, guid: 0c2c8bed0306b7d408a268884c6af79b, type: 3}
+  - {fileID: 21300000, guid: 9d635a6edbcd76549a58fd1b4640cc99, type: 3}
+  - {fileID: 21300000, guid: 42ffabfe4c37e104d8e9d884fe7db980, type: 3}
+  - {fileID: 21300000, guid: 8ae7d31f585b0cf4483963e20305e4f8, type: 3}
+  - {fileID: 21300000, guid: a851bc8ff871b2e4a8101d0ffab93164, type: 3}
+  - {fileID: 21300000, guid: b29210cf5b7b8234984ec842a3110005, type: 3}
+  m_PackedSpriteNamesToIndex:
+  - cog
+  - zoom-out
+  - save
+  - add-music
+  - clock
+  - zoom-reset
+  - undo
+  - tempo-change
+  - copy
+  - fullscreen
+  - grid-snap
+  - bookmark
+  - add-file
+  - tempo-finder
+  - GameEventArrow
+  - selection
+  - document-signed
+  - stop
+  - pause
+  - play
+  - zoom-in
+  - editor-theme
+  - sort
+  - redo
+  - wrench
+  - paste
+  - open-folder
+  - a-z
+  - volume
+  m_RenderDataMap: {}
+  m_Tag: icons_atlas
+  m_IsVariant: 0

Assets/Resources/Sprites/Editor/UI/icons_atlas.spriteatlas.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6735c7c994c42514b9183635285bb184
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4343727234628468602
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/LevelEditor/Editor.cs

@@ -162,6 +162,14 @@ namespace HeavenStudio.Editor
             Application.Quit();
         }
 
+        public void Update()
+        {
+            if (!PersistentDataManager.gameSettings.scaleWScreenSize)
+                MainCanvas.scaleFactor = 1.0f + (0.25f * PersistentDataManager.gameSettings.editorScale);
+
+            MainCanvas.GetComponent<CanvasScaler>().uiScaleMode = (PersistentDataManager.gameSettings.scaleWScreenSize) ? CanvasScaler.ScaleMode.ScaleWithScreenSize : CanvasScaler.ScaleMode.ConstantPixelSize;
+        }
+
         public void LateUpdate()
         {
             if (lastScreenSize != new Vector2(UnityEngine.Screen.width, UnityEngine.Screen.height))

Assets/Scripts/LevelEditor/Timeline/Timeline.cs

@@ -38,6 +38,7 @@ namespace HeavenStudio.Editor.Track
         public float WidthPerBeat { get; private set; } = 100.0f;
         public float PixelsPerBeat => WidthPerBeat * Zoom;
         public float Zoom { get; private set; } = 1.0f;
+        public float VerticalZoom { get; private set; } = 1.0f;
         public float MousePos2Beat { get; private set; }
         public float MousePos2Layer { get; private set; }
         public float MousePos2BeatSnap => Mathp.Round2Nearest(MousePos2Beat + (SnapInterval() * 0.5f), SnapInterval());
@@ -294,11 +295,11 @@ namespace HeavenStudio.Editor.Track
 
             ZoomInBTN.onClick.AddListener(delegate
             {
-                zoomComponent.Zoom(0.25f * zoomComponent.Scale.x, Vector2.zero);
+                zoomComponent.Zoom(0.25f * zoomComponent.Scale.x, Vector2.zero, true);
             });
             ZoomOutBTN.onClick.AddListener(delegate
             {
-                zoomComponent.Zoom(-0.2f * zoomComponent.Scale.x, Vector2.zero);
+                zoomComponent.Zoom(-0.2f * zoomComponent.Scale.x, Vector2.zero, true);
             });
             ZoomResetBTN.onClick.AddListener(delegate
             {
@@ -355,7 +356,7 @@ namespace HeavenStudio.Editor.Track
             if (songBeats == 0) songBeats = 320;
             else songBeats += 10;
 
-            TimelineContent.sizeDelta = new Vector2(songBeats * PixelsPerBeat, currentSizeDelta.y);
+            TimelineContent.sizeDelta = new Vector2(songBeats * PixelsPerBeat, currentSizeDelta.y * RealTimelineContent.localScale.y);
             // TimelineEventGrid.sizeDelta = new Vector2(songBeats * PixelsPerBeat, currentSizeDelta.y);
             RealTimelineContent.sizeDelta = new Vector2(TimelineContent.sizeDelta.x / Zoom, RealTimelineContent.sizeDelta.y);
         }
@@ -417,7 +418,9 @@ namespace HeavenStudio.Editor.Track
             RectTransformUtility.ScreenPointToLocalPointInRectangle(EventContent, Input.mousePosition, Editor.instance.EditorCamera, out relativeMousePos);
 
             MouseInTimeline = this.gameObject.activeSelf && RectTransformUtility.RectangleContainsScreenPoint(EventContent, Input.mousePosition, Editor.instance.EditorCamera);
-
+            if (MouseInTimeline)
+                MouseInTimeline = RectTransformUtility.RectangleContainsScreenPoint(TimelineScroll.viewport,
+                    Input.mousePosition, Editor.instance.EditorCamera);
 
             /*
             if (MouseInTimeline)
@@ -607,7 +610,7 @@ namespace HeavenStudio.Editor.Track
                 layerRect.sizeDelta = new Vector2(layerRect.sizeDelta.x, LayerHeight());
             }
 
-            RealTimelineContent.sizeDelta = new Vector2(RealTimelineContent.sizeDelta.x, LayerHeight() * LayerCount);
+            RealTimelineContent.sizeDelta = new Vector2(RealTimelineContent.sizeDelta.x, (LayerHeight() * LayerCount) / VerticalZoom);
         }
 
         public void LateUpdate()
@@ -1109,8 +1112,8 @@ namespace HeavenStudio.Editor.Track
 
         public float LayerHeight()
         {
-            var defaultHeight = 32;
-            return Mathf.Max(defaultHeight, (LayersRect.rect.height / LayerCount));
+            var defaultHeight = 32 * VerticalZoom;
+            return Mathf.Max(defaultHeight, (LayersRect.rect.height / LayerCount) * VerticalZoom);
             // return LayersRect.rect.height / LayerCount;
         }
 
@@ -1148,6 +1151,14 @@ namespace HeavenStudio.Editor.Track
             TimelineBlockManager.Instance.OnZoom();
         }
 
+        public void OnZoomVertical(float zoom)
+        {
+            VerticalZoom = zoom;
+
+            FitToSong();
+            TimelineBlockManager.Instance.OnZoom();
+        }
+
         public void UpdateOffsetText()
         {
             // show up to 4 decimal places

Assets/Scripts/LevelEditor/Timeline/TimelineZoom.cs

@@ -3,7 +3,7 @@ using UnityEngine.EventSystems;
 
 namespace HeavenStudio.Editor.Track
 {
-    public class TimelineZoom : MonoBehaviour, IScrollHandler
+    public class TimelineZoom : MonoBehaviour
     {
         public Vector3 Scale => _scale;
 
@@ -25,7 +25,17 @@ namespace HeavenStudio.Editor.Track
             rectTransform.localScale = _scale;
         }
 
-        public void OnScroll(PointerEventData eventData)
+        private void Update()
+        {
+            var scrollDeltaY = Input.mouseScrollDelta.y;
+            if (scrollDeltaY != 0)
+            {
+                if (Timeline.instance.MouseInTimeline)
+                    OnScroll(scrollDeltaY);
+            }
+        }
+
+        public void OnScroll(float scrollDeltaY)
         {
             if (Conductor.instance.NotStopped()) return;
 
@@ -37,37 +47,70 @@ namespace HeavenStudio.Editor.Track
             if (cam == null) Debug.LogError("Camera not set!");
             RectTransformUtility.ScreenPointToLocalPointInRectangle(rectTransform, Input.mousePosition, cam, out relativeMousePosition);
 
-            float delta = eventData.scrollDelta.y;
-
-            if (delta > 0)
+            if (scrollDeltaY > 0)
             {
-                Zoom(0.25f * _scale.x, relativeMousePosition);
+                if (Input.GetKey(KeyCode.LeftControl))
+                {
+                    Zoom(0.25f * _scale.y, relativeMousePosition, false);
+                }
+                else
+                {
+                    Zoom(0.25f * _scale.x, relativeMousePosition, true);
+                }
             }
-            else if (delta < 0)
+            else if (scrollDeltaY < 0)
             {
-                var incre = -0.2f * _scale.x;
-                if (_scale.x + incre > minScale - 0.1f)
-                    Zoom(-0.2f * _scale.x, relativeMousePosition);
+                if (Input.GetKey(KeyCode.LeftControl))
+                {
+                    var incre = -0.2f * _scale.y;
+                    if (_scale.y + incre > minScale - 0.1f)
+                        Zoom(-0.2f * _scale.y, relativeMousePosition, false);
+                }
+                else
+                {
+                    var incre = -0.2f * _scale.x;
+                    if (_scale.x + incre > minScale - 0.1f)
+                        Zoom(-0.2f * _scale.x, relativeMousePosition, true);
+                }
             }
         }
 
-        public void Zoom(float incre, Vector2 relativeMousePosition)
+        public void Zoom(float incre, Vector2 relativeMousePosition, bool horiz)
         {
             if (!(_scale.x < maxScale)) return;
 
-            var newScale = Mathf.Clamp(_scale.x + incre, minScale, maxScale);
-            _scale.Set(newScale, 1, 1);
-            relativeMousePosition = new Vector2(relativeMousePosition.x, 0);
-            relMousePos -= (relativeMousePosition * incre);
+            if (horiz)
+            {
+                var newScale = Mathf.Clamp(_scale.x + incre, minScale, maxScale);
+                _scale.Set(newScale, _scale.y, 1);
+                relativeMousePosition = new Vector2(relativeMousePosition.x, 0);
+                relMousePos -= (relativeMousePosition * incre);
 
-            rectTransform.localScale = _scale;
-            rectTransform.anchoredPosition = relMousePos;
+                rectTransform.localScale = _scale;
+                rectTransform.anchoredPosition = relMousePos;
 
-            rectTransform.localScale =
-                new Vector3(Mathf.Clamp(rectTransform.localScale.x, minScale, Mathf.Infinity),
-                    rectTransform.localScale.y);
+                rectTransform.localScale =
+                    new Vector3(Mathf.Clamp(rectTransform.localScale.x, minScale, Mathf.Infinity),
+                        rectTransform.localScale.y);
 
-            Timeline.instance.OnZoom(newScale);
+                Timeline.instance.OnZoom(newScale);
+            }
+            else
+            {
+                var newScale = Mathf.Clamp(_scale.y + incre, 1.0f, maxScale);
+                _scale.Set(_scale.x, newScale, 1);
+                relativeMousePosition = new Vector2(0, relativeMousePosition.y);
+                relMousePos -= (relativeMousePosition * incre);
+
+                rectTransform.localScale = _scale;
+                rectTransform.anchoredPosition = relMousePos;
+
+                rectTransform.localScale =
+                    new Vector3(rectTransform.localScale.x, 
+                    Mathf.Clamp(rectTransform.localScale.y, 1.0f, Mathf.Infinity));
+
+                Timeline.instance.OnZoomVertical(newScale);
+            }
         }
 
         public void SetNewPos(float newX)

Assets/Scripts/PersistentDataManager.cs

@@ -113,7 +113,9 @@ namespace HeavenStudio.Common
                 bool timingDisplayMinMode = false,
                 bool overlaysInEditor = true,
                 bool letterboxBgEnable = true,
-                bool letterboxFxEnable = true
+                bool letterboxFxEnable = true,
+                int editorScale = 0,
+                bool scaleWScreenSize = false
                 )
             {
                 this.showSplash = showSplash;
@@ -132,6 +134,8 @@ namespace HeavenStudio.Common
                     this.discordRPCEnable = false;
                 else
                     this.discordRPCEnable = true;
+                this.editorScale = editorScale;
+                this.scaleWScreenSize = scaleWScreenSize;
 
                 this.perfectChallengeType = perfectChallengeType;
                 this.isMedalOn = isMedalOn;
@@ -169,6 +173,8 @@ namespace HeavenStudio.Common
             // Editor Settings
             public bool editorCursorEnable;
             public bool discordRPCEnable;
+            public int editorScale;
+            public bool scaleWScreenSize;
 
             // Gameplay Settings
             public PerfectChallengeType perfectChallengeType;

Assets/Scripts/UI/SettingsDialog/Tabs/EditorSettings.cs

@@ -10,10 +10,17 @@ namespace HeavenStudio.Editor
     {
         public Toggle cursorCheckbox;
         public Toggle discordRPCCheckbox;
+        public Button editorScaleDecre, editorScaleIncre;
+        public Toggle scaleWSS;
 
-        private void Start() {
+        private void Start()
+        {
             cursorCheckbox.isOn = PersistentDataManager.gameSettings.editorCursorEnable;
             discordRPCCheckbox.isOn = PersistentDataManager.gameSettings.discordRPCEnable;
+            scaleWSS.isOn = PersistentDataManager.gameSettings.scaleWScreenSize;
+
+
+            SetDecreIncreInteractable();
         }
 
         public void OnCursorCheckboxChanged()
@@ -36,10 +43,50 @@ namespace HeavenStudio.Editor
         {
             cursorCheckbox.isOn = PersistentDataManager.gameSettings.editorCursorEnable;
             discordRPCCheckbox.isOn = PersistentDataManager.gameSettings.discordRPCEnable;
+            scaleWSS.isOn = PersistentDataManager.gameSettings.scaleWScreenSize;
+
+
+            SetDecreIncreInteractable();
         }
 
         public override void OnCloseTab()
         {
         }
+
+        public void OnSWSSChanged()
+        {
+            PersistentDataManager.gameSettings.scaleWScreenSize = scaleWSS.isOn;
+            scaleWSS.isOn = PersistentDataManager.gameSettings.scaleWScreenSize;
+        }
+
+        public void OnEditorScaleDecre()
+        {
+            PersistentDataManager.gameSettings.editorScale--;
+            if (PersistentDataManager.gameSettings.editorScale < -3)
+                PersistentDataManager.gameSettings.editorScale = -3;
+
+            SetDecreIncreInteractable();
+        }
+
+        public void OnEditorScaleIncre()
+        {
+            PersistentDataManager.gameSettings.editorScale++;
+            if (PersistentDataManager.gameSettings.editorScale > 5)
+                PersistentDataManager.gameSettings.editorScale = 5;
+
+            SetDecreIncreInteractable();
+        }
+
+        public void OnEditorScaleReset()
+        {
+            PersistentDataManager.gameSettings.editorScale = 0;
+            SetDecreIncreInteractable();
+        }
+
+        private void SetDecreIncreInteractable()
+        {
+            editorScaleDecre.interactable = PersistentDataManager.gameSettings.editorScale > -3; // hardcoded? We might not change.
+            editorScaleIncre.interactable = PersistentDataManager.gameSettings.editorScale < 5;
+        }
     }
 }