diff options
| author | Greg Ercolano <erco@seriss.com> | 2016-08-30 06:00:57 +0000 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2016-08-30 06:00:57 +0000 |
| commit | 560e2d06ba8d10025d94721142cf156e9799c516 (patch) | |
| tree | e587e8c1e04ae840f3a9f4e9b3b828e568949291 | |
| parent | 0e404ab7d738de85f4f4023d2eb32a9b6ab1a854 (diff) | |
Bringing over fix [r11880] from 1.3 current to the porting branch.
Limit line numbering to New>Code editor.
(was affecting Properties->Callback and New>Code>Comment editors)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11906 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | fluid/CodeEditor.cxx | 2 | ||||
| -rw-r--r-- | fluid/function_panel.cxx | 3 | ||||
| -rw-r--r-- | fluid/function_panel.fl | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/fluid/CodeEditor.cxx b/fluid/CodeEditor.cxx index 8a95453d4..e4fbc57f2 100644 --- a/fluid/CodeEditor.cxx +++ b/fluid/CodeEditor.cxx @@ -405,8 +405,6 @@ CodeEditor::CodeEditor(int X, int Y, int W, int H, const char *L) : mBuffer->add_modify_callback(style_update, this); add_key_binding(FL_Enter, FL_TEXT_EDITOR_ANY_STATE, (Fl_Text_Editor::Key_Func)auto_indent); - linenumber_width(60); - linenumber_size(Fl_Text_Display::textsize()); } // Destroy a CodeEditor widget... diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx index 2988dae60..15f6cbf54 100644 --- a/fluid/function_panel.cxx +++ b/fluid/function_panel.cxx @@ -197,6 +197,9 @@ Fl_Double_Window* make_code_panel() { code_panel->set_modal(); code_panel->end(); } // Fl_Double_Window* code_panel + // Enable line numbers + code_input->linenumber_width(60); + code_input->linenumber_size(code_input->Fl_Text_Display::textsize()); return code_panel; } diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl index 9d7faa021..62046318a 100644 --- a/fluid/function_panel.fl +++ b/fluid/function_panel.fl @@ -164,6 +164,9 @@ code_panel->hide(); // otherwise hide..} open } } } + code {// Enable line numbers +code_input->linenumber_width(60); +code_input->linenumber_size(code_input->Fl_Text_Display::textsize());} {} } Function {make_codeblock_panel()} {} { |