Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions committed Jan 16, 2025
2 parents 64a2ab3 + 568110c commit 528edf7
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ <h1><span data-field="title" data-format="default">flexpanel_create_node</span><
<p>This function creates a new <span data-keyref="FlexPanel">Flex Panel</span> node.</p>
<p>You can optionally pass either a JSON string or a struct containing the node&#39;s properties, which are <a href="../Flex_Panels_Styling.htm">described here</a>. These properties can also be set later using other <a data-xref="{title}" href="section_index.htm">Flex Panel Functions</a>.</p>
<p>The returned node can be <a href="flexpanel_node_insert_child.htm">inserted into another node</a> as a child. When you no longer need a node, you must <a href="flexpanel_delete_node.htm">delete it</a> otherwise it will continue to stay in memory.</p>
<h3>Usage Notes</h3>
<ul class="colour">
<li>When using a struct to create a node, the struct passed into the function will be used to store the created node&#39;s data and the same struct will be modified when any modifications are performed on the node. This means that passing the same struct variable into multiple calls to this function will result in the same node being returned. You can run <span class="inline3_func"><a data-xref="{title}" href="../../Variable_Functions/variable_clone.htm">variable_clone</a></span> on your struct variable before passing it into this function to ensure a copy is made and the original struct is not referenced in the created node.</li>
</ul>
<p> </p>
<p> </p>
<h4>Syntax:</h4>
<p class="code"><span data-field="title" data-format="default">flexpanel_create_node</span>([struct_or_json]);</p>
Expand Down
5 changes: 3 additions & 2 deletions Manual/contents/IDE_Tools/Prefab_Library.htm
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ <h2>Using Prefab Assets</h2>
<p class="note"><span data-conref="../assets/snippets/Tag_note.hts"> </span> If you use assets from a Collection in your project and then delete the package for that Collection, you will get a &quot;<strong>Resource load failure</strong>&quot; error window on opening the project in the IDE and potential errors at runtime.</p>
<h2>Prefab Library Features</h2>
<p>The Prefab Library window is divided into the following sections:</p>
<p><img class="center" src="../assets/Images/IDE Tools/Prefabs/prefab_sections.png" />The left section displays the Folder List that contains a tree view of your Prefab Collections. The right section displays the contents of the currently open folder (or your Prefab Collections if no folder is selected). The divider between these two sections can be dragged to resize the sections.</p>
<p><img class="center" src="../assets/Images/IDE Tools/Prefabs/prefab_sections.png" style="cursor: nesw-resize;" />The left section displays the Folder List that contains a tree view of your Prefab Collections. The right section displays the contents of the currently open folder (or your Prefab Collections if no folder is selected). The divider between these two sections can be dragged to resize the sections.</p>
<p>The Folder List section contains the following parts:</p>
<ul class="colour">
<li><strong>Search Bar</strong>: This lets you search for any assets across all of the Prefab Collections that you have added from the <a data-xref="{title}" href="Package_Manager.htm">Package Manager</a>.</li>
Expand All @@ -63,10 +63,11 @@ <h2>Prefab Library Features</h2>
</ul>
<p>The bottom bar of the window displays the number of items in the selected folder or the number of Collections if no folder is selected.</p>
<h3>RMB Menu</h3>
<p><img class="center" src="../assets/Images/IDE Tools/Prefabs/prefab_rmb.png" />Right-clicking on any item in the Prefab Library displays the following options:</p>
<p>Right-clicking on any item in the Prefab Library displays the following options:</p>
<ul class="colour">
<li><strong>Make Favourite</strong>: Add the selected folder or asset to Favourites. Your Favourites can be viewed from the <img class="icon" height="16" src="../assets/Images/Icons/Icon_ExtensionMenu.png" width="16" /> <strong>Sort/Filter</strong> menu.</li>
<li><strong>Duplicate into Project</strong>: This duplicates the selected asset into your project as a local asset, i.e. the asset becomes unlinked from its Collection and is fully editable as part of the current project. It will no longer be updated if there are changes to its source asset in the Collection.</li>
<li><strong>Expand Children</strong>: This option is available in the Folder List. It expands all the folders under the selected folder.</li>
<li><b>Expand/Collapse All: </b>This option is available in the Folder List. It expands or collapses all the folders in the tree view.</li>
</ul>
<p> </p>
Expand Down
2 changes: 1 addition & 1 deletion Manual/contents/Quick_Start_Guide/What_Is_Programming_.htm
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,4 @@ <h5><span data-keyref="Copyright Notice">© Copyright <span class="notranslate">
qs_programming
-->
</body>
</html>
</html>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Code Editor Preferences</title>
<title>Code Editor 2 Preferences</title>
<meta name="generator" content="Adobe RoboHelp 2022" />
<link rel="stylesheet" href="../../assets/css/default.css" type="text/css" />
<script src="../../assets/scripts/main_script.js" type="module"></script>
Expand All @@ -14,7 +14,7 @@
</head>
<body>
<!--<div class="body-scroll" style="top: 150px;">-->
<h1><span data-keyref="Code_Editor2_Name">Code Editor</span> Preferences</h1>
<h1><span data-keyref="Code_Editor2_Name">Code Editor 2</span> Preferences</h1>
<p><img class="center" src="../../assets/Images/Setup_And_Version/Preferences/CE_Prefs_Main.png" />This page describes all the preferences for <a data-xref="{title}" href="../../The_Asset_Editors/The_Text_Editor.htm">The Code Editor (Beta)</a>, which contains the following sections:</p>
<div class="minitoc" data-minitoc-targetid="drop-down" data-type="minitoc" style="">
<p class="minitoc-caption" data-close-text="" data-expanded="true" data-open-text="Contents" data-type="minitoc-caption" href="#" style="">Mini TOC (placeholder)</p>
Expand All @@ -25,8 +25,8 @@ <h1><span data-keyref="Code_Editor2_Name">Code Editor</span> Preferences</h1>
<h2>Main</h2>
<p>The main section contains the following options:</p>
<ul class="colour">
<li><strong>Enabled</strong>: Enable or disable the <span data-keyref="Code_Editor2_Name">Code Editor</span>, disabling will make it fall back to the <span data-keyref="Code_Editor1_Name">Legacy Code Editor</span>. Changing this option will require you to restart the IDE. (Default: Disabled)</li>
<li><strong>Open Asset in Inspector when Editor is opened</strong>: When you open an asset in the <span data-keyref="Code_Editor2_Name">Code Editor</span>, and this option is enabled, <a data-xref="{title}" href="../../IDE_Tools/The_Inspector.htm">The Inspector</a> will switch its focus to the newly opened asset so you can modify its properties. (Default: Enabled)</li>
<li><strong>Enabled</strong>: Enable or disable the <span data-keyref="Code_Editor2_Name">Code Editor 2</span>, disabling will make it fall back to the <span data-keyref="Code_Editor1_Name">Legacy Code Editor</span>. Changing this option will require you to restart the IDE. (Default: Disabled)</li>
<li><strong>Open Asset in Inspector when Editor is opened</strong>: When you open an asset in the <span data-keyref="Code_Editor2_Name">Code Editor 2</span>, and this option is enabled, <a data-xref="{title}" href="../../IDE_Tools/The_Inspector.htm">The Inspector</a> will switch its focus to the newly opened asset so you can modify its properties. (Default: Enabled)</li>
<li><strong>Lock Documents when Debugger is active</strong>: When enabled, all documents in the project will become read-only while the Debugger is active. When disabled, you can edit those documents during Debugging.</li>
<li><strong>Default Delete Document Choice</strong>: This controls what happens when you choose to delete a document. You can choose to show the dialog message, or automatically delete (<strong>Yes</strong>) or not delete (<strong>No</strong>) the document.</li>
</ul>
Expand Down Expand Up @@ -83,11 +83,12 @@ <h3>Editing</h3>
<li><strong>Allow selected text to be dragged and dropped</strong>: This controls whether you are able to drag and drop selected text in an editor from one place in the document to another.</li>
<li><strong>Trim leading whitespace on backspace</strong>: When deleting whitespace at the start of a line using <span class="shortcut">backspace</span>, this controls whether the newline character before the whitespace is deleted as well, joining both lines together.</li>
<li><strong>Insert separating whitespace when joining lines</strong>: This controls whether whitespace is inserted when pressing <span class="shortcut">Backspace</span> at the start of a line to join it with the line before.</li>
<li><span><strong>Prefer strict commenting of selected text over commenting selected lines</strong>: When enabled, commenting selected text with <span class="shortcut">CTRL+K</span> will comment from the start of the selection to the end of the selection. When disabled, all selected lines will completely be commented out regardless of where the text selection begins or ends within the lines. (Default: Enabled)</span></li>
<li><strong>Undo/Redo stack limit</strong>: Size of the undo/redo stack limit which controls how many undo commands you can perform. Any value below 0 is considered &quot;unlimited&quot;. (Default: 200)</li>
</ul>
<h2 id="h">Theme</h2>
<p>The Theme section allows you to modify how documents are rendered in the editor.</p>
<p><img class="center" src="../../assets/Images/Setup_And_Version/Preferences/CE_Prefs_Theme.png" />The first option is the font used by the <span data-keyref="Code_Editor2_Name">Code Editor</span>. Fonts that are fixed-width (which are recommended for coding over non-fixed-width fonts) are <strong>bolded</strong> in the drop-down list.</p>
<p><img class="center" src="../../assets/Images/Setup_And_Version/Preferences/CE_Prefs_Theme.png" />The first option is the font used by the <span data-keyref="Code_Editor2_Name">Code Editor 2</span>. Fonts that are fixed-width (which are recommended for coding over non-fixed-width fonts) are <strong>bolded</strong> in the drop-down list.</p>
<p>You can also choose the size of the font, and whether to enable ligatures for fonts that use them.</p>
<h3>Theme Selector</h3>
<p>This contains a drop-drop menu for theme selection, with the default being &quot;<strong>GameMaker Dark - Default</strong>&quot;. You can edit any properties of the default theme.</p>
Expand Down
Loading

0 comments on commit 528edf7

Please sign in to comment.