From dc63eb18ef4c377920e6c3c20f8d9f00d03b33a7 Mon Sep 17 00:00:00 2001 From: gwaredd Date: Sat, 9 Nov 2019 16:49:49 +0000 Subject: [PATCH] removed runtime reference --- Editor/Mischief.MDV.Editor.asmdef | 8 +++----- Editor/{ => Scripts}/MarkdownAsset.cs | 0 Editor/{ => Scripts}/MarkdownAsset.cs.meta | 0 Editor/{ => Scripts}/MarkdownImporter.cs | 0 Editor/{ => Scripts}/MarkdownImporter.cs.meta | 0 Editor/Scripts/MarkdownViewer.cs | 3 ++- Tests/Editor/EdgeCases/markdown.markdown.meta | 4 ++-- .../tests/extensions/blackfriday/README.markdown.meta | 4 ++-- .../tests/extensions/gfm/README.markdown.meta | 4 ++-- .../tests/extensions/hoedown/README.markdown.meta | 4 ++-- .../tests/extensions/kramdown/README.markdown.meta | 4 ++-- .../tests/extensions/lunamark/README.markdown.meta | 4 ++-- .../tests/extensions/markdown2/README.markdown.meta | 4 ++-- .../tests/extensions/markdown_pl/README.markdown.meta | 4 ++-- .../tests/extensions/marked/README.markdown.meta | 4 ++-- .../tests/extensions/maruku/README.markdown.meta | 4 ++-- .../tests/extensions/md2html/README.markdown.meta | 4 ++-- .../tests/extensions/multimarkdown/README.markdown.meta | 4 ++-- .../tests/extensions/pandoc/README.markdown.meta | 4 ++-- .../tests/extensions/peg_markdown/README.markdown.meta | 4 ++-- .../tests/extensions/rdiscount/README.markdown.meta | 4 ++-- .../tests/extensions/redcarpet/README.markdown.meta | 4 ++-- .../tests/extensions/showdown/README.markdown.meta | 4 ++-- 23 files changed, 39 insertions(+), 40 deletions(-) rename Editor/{ => Scripts}/MarkdownAsset.cs (100%) rename Editor/{ => Scripts}/MarkdownAsset.cs.meta (100%) rename Editor/{ => Scripts}/MarkdownImporter.cs (100%) rename Editor/{ => Scripts}/MarkdownImporter.cs.meta (100%) diff --git a/Editor/Mischief.MDV.Editor.asmdef b/Editor/Mischief.MDV.Editor.asmdef index 73a18b2..908d89c 100644 --- a/Editor/Mischief.MDV.Editor.asmdef +++ b/Editor/Mischief.MDV.Editor.asmdef @@ -1,8 +1,7 @@ { "name": "Mischief.MDV.Editor", - "references": [ - "Mischief.MDV.Runtime" - ], + "references": [], + "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], @@ -11,6 +10,5 @@ "overrideReferences": false, "precompiledReferences": [], "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [] + "defineConstraints": [] } \ No newline at end of file diff --git a/Editor/MarkdownAsset.cs b/Editor/Scripts/MarkdownAsset.cs similarity index 100% rename from Editor/MarkdownAsset.cs rename to Editor/Scripts/MarkdownAsset.cs diff --git a/Editor/MarkdownAsset.cs.meta b/Editor/Scripts/MarkdownAsset.cs.meta similarity index 100% rename from Editor/MarkdownAsset.cs.meta rename to Editor/Scripts/MarkdownAsset.cs.meta diff --git a/Editor/MarkdownImporter.cs b/Editor/Scripts/MarkdownImporter.cs similarity index 100% rename from Editor/MarkdownImporter.cs rename to Editor/Scripts/MarkdownImporter.cs diff --git a/Editor/MarkdownImporter.cs.meta b/Editor/Scripts/MarkdownImporter.cs.meta similarity index 100% rename from Editor/MarkdownImporter.cs.meta rename to Editor/Scripts/MarkdownImporter.cs.meta diff --git a/Editor/Scripts/MarkdownViewer.cs b/Editor/Scripts/MarkdownViewer.cs index 7aca167..97da926 100644 --- a/Editor/Scripts/MarkdownViewer.cs +++ b/Editor/Scripts/MarkdownViewer.cs @@ -106,6 +106,7 @@ public void Draw() var rectFullScreen = new Rect( 0.0f, rectContainer.yMin - 4.0f, Screen.width, Screen.height ); GUI.DrawTexture( rectFullScreen, EditorGUIUtility.whiteTexture, ScaleMode.StretchToFill, false ); + Debug.Log( rectContainer.width ); // scroll window @@ -113,7 +114,7 @@ public void Draw() var padRight = 4.0f; var padHoriz = padLeft + padRight; var scrollWidth = GUI.skin.verticalScrollbar.fixedWidth; - var minWidth = rectContainer.width - scrollWidth - padHoriz; + var minWidth = rectContainer.width - scrollWidth - padHoriz - 200.0f; var maxHeight = ContentHeight( minWidth ); var hasScrollbar = maxHeight >= rectContainer.height; diff --git a/Tests/Editor/EdgeCases/markdown.markdown.meta b/Tests/Editor/EdgeCases/markdown.markdown.meta index 7ae14a0..88708f6 100644 --- a/Tests/Editor/EdgeCases/markdown.markdown.meta +++ b/Tests/Editor/EdgeCases/markdown.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 01001ad4321ca914fb60bbaae2588dd3 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/blackfriday/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/blackfriday/README.markdown.meta index 834c580..5c42416 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/blackfriday/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/blackfriday/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 0497e70644e65f340aa0b19fb145ecbb ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/gfm/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/gfm/README.markdown.meta index 40aced9..ac07fe8 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/gfm/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/gfm/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 6ca62dc301597f549877b28d12f46db5 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/hoedown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/hoedown/README.markdown.meta index 4d9e6de..8f4bbec 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/hoedown/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/hoedown/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 51527ad4342d4a443b4ebde0cf2d3030 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/kramdown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/kramdown/README.markdown.meta index 4ad9c63..47b7a82 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/kramdown/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/kramdown/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 98d415e947b39dc4a9bd992507b74994 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/lunamark/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/lunamark/README.markdown.meta index 2a533b4..265fb32 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/lunamark/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/lunamark/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: ff524cf114406374da753bde522a9008 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown2/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown2/README.markdown.meta index 612353e..ca6dd5a 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown2/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown2/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: fbe88e28611f27f448ec293e94fc96db ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown_pl/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown_pl/README.markdown.meta index 2c97b9b..f096764 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown_pl/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown_pl/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 6396143fabe3f4a4391824d363adce63 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/marked/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/marked/README.markdown.meta index 4637e9e..45d9dac 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/marked/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/marked/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: b5c62f5220c875a418252529da3a6df2 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/maruku/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/maruku/README.markdown.meta index 054b1b0..25d2546 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/maruku/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/maruku/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: a979567576ab3ae4c8eb52252ad276ac ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/md2html/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/md2html/README.markdown.meta index b3de9cd..0877270 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/md2html/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/md2html/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 37b1509bb9145854ab253dc11bd62903 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/multimarkdown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/multimarkdown/README.markdown.meta index be33c65..74f4b97 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/multimarkdown/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/multimarkdown/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 6532382f9e8535a429970174b6c8b563 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/pandoc/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/pandoc/README.markdown.meta index 64531d5..8c97f65 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/pandoc/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/pandoc/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8cd874ab5dbeca14b9159a3103ec6f3d ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/peg_markdown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/peg_markdown/README.markdown.meta index 5cc371c..ce40584 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/peg_markdown/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/peg_markdown/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: d48734260fc2a8248905d656b3f2df15 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/rdiscount/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/rdiscount/README.markdown.meta index 3fb185c..d0b66a0 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/rdiscount/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/rdiscount/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 55e1a83d1343cbc47b820556749cdd2d ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/redcarpet/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/redcarpet/README.markdown.meta index ee1855c..5fe3f6b 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/redcarpet/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/redcarpet/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8192a18812b66f0499eab3ac098c7ab5 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/showdown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/showdown/README.markdown.meta index f79466c..e3ab5ba 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/showdown/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/showdown/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8d31e5f9c4546c44abde424efbbd2c48 ScriptedImporter: - internalIDToNameTable: [] + fileIDToRecycleName: + 4900000: main externalObjects: {} - serializedVersion: 2 userData: assetBundleName: assetBundleVariant: