-

Author: aiekick

3rdparty/imguipack

@@ -395,6 +395,14 @@ void CodeEditor::SetBreakpointInteractionEnabled(bool aEnabled) {
     m_BreakpointInteractionEnabled = aEnabled;
 }
 
+void CodeEditor::SetPendingFontScale(float aScale) {
+    m_Editor.SetPendingFontScale(aScale);
+}
+
+float CodeEditor::GetCurrentFontScale() const {
+    return m_Editor.GetCurrentFontScale();
+}
+
 void CodeEditor::m_RebuildMarkers() {
     m_Editor.ClearMarkers();
     // breakpoints are drawn by the line decorator (a red dot); markers carry errors + current line

src/frontend/Components/CodeEditor.cpp

@@ -97,6 +97,12 @@ class CodeEditor {
     void SetHoverTokenCallback(std::function<void(const std::string& aToken)> aCallback);
     void SetBreakpoints(const std::unordered_set<int32_t>& aZeroBasedLines, int64_t aRevision);
     void SetCurrentExecLine(int32_t aZeroBasedLine);
+
+    // per-editor persistent font scale — pushes a one-shot value into the underlying TextEditor
+    // (applied on the next render after BeginChild). GetCurrentFontScale reads back the effective
+    // scale; the host polls it after OnImGui to detect interactive Ctrl+MouseWheel zoom and persist.
+    void SetPendingFontScale(float aScale);
+    float GetCurrentFontScale() const;
     void SetBreakpointInteractionEnabled(bool aEnabled);
 
 private:

src/frontend/Components/CodeEditor.h

@@ -135,6 +135,16 @@ bool CodePane::drawPanes(bool* apOpened, LayoutPaneUserDatas apUserDatas) {
                             }
                             sheet.codeEditor.SetBreakpointInteractionEnabled(isDebugArmed);
                             sheet.codeEditor.OnImGui();
+                            // capture interactive Ctrl+MouseWheel zoom on the project-script sheet
+                            // and persist it via ProjectFile. Only the project-script sheet — external
+                            // file sheets are transient and not persisted in the project XML.
+                            if (sheet.filepathName == sc_PROJECT_SCRIPT_ID) {
+                                const float liveScale = sheet.codeEditor.GetCurrentFontScale();
+                                if (liveScale > 0.0f && std::fabs(liveScale - ProjectFile::ref()->m_ProjectScriptFontScale) > 0.001f) {
+                                    ProjectFile::ref()->m_ProjectScriptFontScale = liveScale;
+                                    ProjectFile::ref()->SetProjectChange(true);
+                                }
+                            }
                             ImGui::EndTabItem();
                         }
                         ImGui::PopID();
@@ -379,6 +389,10 @@ void CodePane::OpenScript(const std::string& aCode) {
         scriptSheetPtr = &sheet;
     }
     scriptSheetPtr->codeEditor.SetCode(aCode, TextEditor::Language::Lua());
+    // restore the persisted zoom — one-shot pending value that the editor applies on its next
+    // Render after BeginChild. After that, ImGui's interactive Ctrl+MouseWheel takes over and the
+    // drawPanes loop above captures any change back into ProjectFile.
+    scriptSheetPtr->codeEditor.SetPendingFontScale(ProjectFile::ref()->m_ProjectScriptFontScale);
 }
 
 std::string CodePane::GetScriptCode() {

src/panes/misc/CodePane.cpp

@@ -313,6 +313,7 @@ ez::xml::Nodes ProjectFile::getXmlNodes(const std::string& /*vUserDatas*/) {
     node.addChild("auto_resize_columns_log_view").setContent(m_AutoResizeLogColumns);
     node.addChild("auto_resize_columns_log_2nd_view").setContent(m_AutoResizeLog2ndColumns);
     node.addChild("hovered_list_changed_text_rect_thickness").setContent(m_HoveredListChangedTextRectThickNess);
+    node.addChild("project_script_font_scale").setContent(m_ProjectScriptFontScale);
     node.addChild("last_log_file_path").setContent(m_LastLogFilePath);
     node.addChild("script_file").setContent(m_ScriptFilePathName);
     auto& childNode = node.addChild("log_files");
@@ -398,6 +399,9 @@ bool ProjectFile::setFromXmlNodes(const ez::xml::Node& vNode, const ez::xml::Nod
             m_AutoResizeLog2ndColumns = ez::dvariant(strValue).GetB();
         } else if (strName == "hovered_list_changed_text_rect_thickness") {
             m_HoveredListChangedTextRectThickNess = ez::fvariant(strValue).GetF();
+        } else if (strName == "project_script_font_scale") {
+            m_ProjectScriptFontScale = ez::fvariant(strValue).GetF();
+            if (m_ProjectScriptFontScale <= 0.0f) m_ProjectScriptFontScale = 1.0f;
         } else if (strName == "last_log_file_path") {
             m_LastLogFilePath = strValue;
         } else if (strName == "script_file") {

src/project/ProjectFile.cpp

@@ -76,6 +76,7 @@ class ProjectFile : public Ltg::IProject, public ez::xml::Config {
     bool m_AutoResizeLogColumns = false;
     bool m_AutoResizeLog2ndColumns = false;
     float m_HoveredListChangedTextRectThickNess = 2.0f;
+    float m_ProjectScriptFontScale = 1.0f;  // interactive Ctrl+MouseWheel zoom of the project-script code editor, persisted in the project XML
 
 private:  // dont save
     bool m_IsLoaded = false;